File tree 1 file changed +4
-2
lines changed
1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change 127
127
# The compilers are set in order of priority by
128
128
# 1) environment variables
129
129
# 2) compiler installed by sage
130
- # 3) compiler set at configuration time
130
+ # 3) compiler set at configuration time
131
131
if [ -z " $CC " ]; then
132
132
if [ -n " $SAGE_LOCAL " -a -x " $SAGE_LOCAL /bin/gcc" ]; then
133
133
CC=gcc
@@ -378,7 +378,9 @@ if [ -n "$SAGE_LOCAL" ]; then
378
378
# gives "/Applications/Xcode.app/Contents/Developer", but "ld-classic"
379
379
# is not in the subdirectory "usr/bin/" but rather in the subdirectory
380
380
# "Toolchains/XcodeDefault.xctoolchain/usr/bin/". See #37237.
381
- if [ " $UNAME " = " Darwin" ] && [ -x " $( xcode-select -p) /usr/bin/ld-classic" -o -x " $( xcode-select -p) /Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic" ] ; then
381
+ # However, if LD is set explicitly, as it is within conda on macOS,
382
+ # do not not do this.
383
+ if [ " $UNAME " = " Darwin" ] && [ -z " $LD " ] && [ -x " $( xcode-select -p) /usr/bin/ld-classic" -o -x " $( xcode-select -p) /Toolchains/XcodeDefault.xctoolchain/usr/bin/ld-classic" ] ; then
382
384
LDFLAGS=" -L$SAGE_LOCAL /lib -Wl,-ld_classic,-rpath,$SAGE_LOCAL /lib $LDFLAGS "
383
385
else
384
386
LDFLAGS=" -L$SAGE_LOCAL /lib -Wl,-rpath,$SAGE_LOCAL /lib $LDFLAGS "
You can’t perform that action at this time.
0 commit comments