Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sage-env: identify the version of command-line tools (OS X) and set LDFLAGS accordingly #36599

Merged
merged 4 commits into from
Nov 10, 2023
Merged

sage-env: identify the version of command-line tools (OS X) and set LDFLAGS accordingly #36599

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5251c2f
sage-env: identify the version of command-line tools (OS X)
jhpalmieri Oct 30, 2023
097e704
Merge branch 'develop' into identify-clt-version
jhpalmieri Nov 1, 2023
2341fb4
Set LDFLAGS depending on version of OS X command-line tools
jhpalmieri Nov 2, 2023
543cd2d
Check whether command-line tools includes the executable ld-classic,
jhpalmieri Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/bin/sage-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,14 @@ if [ -n "$PYTHONHOME" ]; then
fi

if [ -n "$SAGE_LOCAL" ]; then
LDFLAGS="-L$SAGE_LOCAL/lib -Wl,-rpath,$SAGE_LOCAL/lib $LDFLAGS"
# On OS X, test whether "ld-classic" is present in the installed
# version of the command-line tools. If so, we add "-ld_classic"
# to LD_FLAGS. See #36599.
if [ "$UNAME" = "Darwin" ] && [ -x "$(xcode-select -p)/usr/bin/ld-classic" ] ; then
LDFLAGS="-L$SAGE_LOCAL/lib -Wl,-ld_classic,-rpath,$SAGE_LOCAL/lib $LDFLAGS"
else
LDFLAGS="-L$SAGE_LOCAL/lib -Wl,-rpath,$SAGE_LOCAL/lib $LDFLAGS"
fi
if [ "$UNAME" = "Linux" ]; then
LDFLAGS="-Wl,-rpath-link,$SAGE_LOCAL/lib $LDFLAGS"
fi
Expand Down
Loading