Skip to content

Commit 913cdbc

Browse files
committed
Pass on the LD_RUN_PATH environment variable.
This is set by conda build system on Linux. Do not disable standard binary_relocation on Linux, it works fine when linker builds with LD_RUN_PATH set.
1 parent 43ef9f9 commit 913cdbc

3 files changed

Lines changed: 1 addition & 3 deletions

File tree

SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def subdictionary(d, keyset):
2828
# copy system environment variables related to compilation
2929
DefaultEnvironment(ENV=subdictionary(os.environ, '''
3030
PATH PYTHONPATH
31-
CPATH CPLUS_INCLUDE_PATH LIBRARY_PATH
31+
CPATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_RUN_PATH
3232
LD_LIBRARY_PATH DYLD_LIBRARY_PATH DYLD_FALLBACK_LIBRARY_PATH
3333
MACOSX_DEPLOYMENT_TARGET
3434
'''.split())

conda-recipe/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export CPATH="${PREFIX}/include:${CPATH}"
44
export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
55

66
if [[ `uname` == Linux ]]; then
7-
export LDFLAGS="${LDFLAGS} "'-Wl,-rpath,\\$$ORIGIN/.'
87
export LD_LIBRARY_PATH="${PREFIX}/lib"
98
fi
109

conda-recipe/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ source:
99

1010
build:
1111
number: 0
12-
binary_relocation: False # [linux]
1312

1413
requirements:
1514
build:

0 commit comments

Comments
 (0)