diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py index 887b5ba5..e83a6bda 100644 --- a/plugins/python/uwsgiplugin.py +++ b/plugins/python/uwsgiplugin.py @@ -4,7 +4,6 @@ from distutils import sysconfig NAME='python' GCC_LIST = ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter', 'tracebacker'] -#OBJ_LIST = ['/usr/lib/libpython2.6.a'] CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ] @@ -16,7 +15,7 @@ LDFLAGS = [] if not 'UWSGI_PYTHON_NOLIB' in os.environ: LIBS = sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split() if not sysconfig.get_config_var('Py_ENABLE_SHARED'): - LIBS.append('-L' + sysconfig.get_config_var('LIBPL')) + LIBS.append('%s/%s' % (sysconfig.get_config_var('LIBPL'), sysconfig.get_config_var('LIBRARY'))) else: try: LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) @@ -26,15 +25,11 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ: os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX - version = sysconfig.get_config_var('VERSION') - try: - version = version + sys.abiflags - except: - pass - LIBS.append('-lpython' + version) + version = sysconfig.get_config_var('VERSION') + try: + version = version + sys.abiflags + except: + pass + LIBS.append('-lpython' + version) else: LIBS = [] - -#if str(PYLIB_PATH) != '': -# libs.insert(0,'-L' + PYLIB_PATH) -# os.environ['LD_RUN_PATH'] = PYLIB_PATH