|
 |
b447a3 |
diff --git a/setup.py b/setup.py
|
|
|
b447a3 |
index e0c8c84..a3e24f1 100644
|
|
|
b447a3 |
--- a/setup.py
|
|
|
b447a3 |
+++ b/setup.py
|
|
|
b447a3 |
@@ -321,19 +321,6 @@ EXTRA_COMPILE_FLAGS = (EXTRA_INCLUDES + CPPFLAGS + EXTRA_CPPFLAGS +
|
|
|
b447a3 |
CFLAGS + EXTRA_CFLAGS + APR_INCLUDES + APU_INCLUDES)
|
|
|
b447a3 |
EXTRA_LINK_ARGS = PYTHON_LDFLAGS + PYTHON_LDLIBS
|
|
|
b447a3 |
|
|
|
b447a3 |
-# Force adding of LD_RUN_PATH for platforms that may need it.
|
|
|
b447a3 |
-
|
|
|
b447a3 |
-LD_RUN_PATHS = []
|
|
|
b447a3 |
-if os.name != 'nt':
|
|
|
b447a3 |
- LD_RUN_PATH = os.environ.get('LD_RUN_PATH', '')
|
|
|
b447a3 |
- LD_RUN_PATHS = [PYTHON_CFGDIR]
|
|
|
b447a3 |
- if PYTHON_LIBDIR != APXS_LIBDIR:
|
|
|
b447a3 |
- LD_RUN_PATHS.insert(0, PYTHON_LIBDIR)
|
|
|
b447a3 |
- LD_RUN_PATH += ':' + ':'.join(LD_RUN_PATHS)
|
|
|
b447a3 |
- LD_RUN_PATH = LD_RUN_PATH.lstrip(':')
|
|
|
b447a3 |
-
|
|
|
b447a3 |
- os.environ['LD_RUN_PATH'] = LD_RUN_PATH
|
|
|
b447a3 |
-
|
|
|
b447a3 |
# On MacOS X, recent versions of Apple's Apache do not support compiling
|
|
|
b447a3 |
# Apache modules with a target older than 10.8. This is because it
|
|
|
b447a3 |
# screws up Apache APR % formats for apr_time_t, which breaks daemon
|
|
|
b447a3 |
@@ -362,7 +349,7 @@ else:
|
|
|
b447a3 |
|
|
|
b447a3 |
extension = Extension(extension_name, source_files,
|
|
|
b447a3 |
include_dirs=INCLUDE_DIRS, extra_compile_args=EXTRA_COMPILE_FLAGS,
|
|
|
b447a3 |
- extra_link_args=EXTRA_LINK_ARGS, runtime_library_dirs=LD_RUN_PATHS)
|
|
|
b447a3 |
+ extra_link_args=EXTRA_LINK_ARGS)
|
|
|
b447a3 |
|
|
|
b447a3 |
def _documentation():
|
|
|
b447a3 |
result = []
|