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

[Runner] Fix value of LD environment variable for macOS #156

Merged
merged 1 commit into from
Jun 29, 2021
Merged

[Runner] Fix value of LD environment variable for macOS #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Runner.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ function platform_envs(platform::AbstractPlatform, src_name::AbstractString;

# If we're on macOS, we give a hint to things like `configure` that they should use this as the linker
if Sys.isapple(platform)
mapping["LD"] = "/opt/$(target)/bin/ld64.macos"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@staticfloat why was this set to this value? There is no such file in our environment:

sandbox:${WORKSPACE} # qfind /opt -name "ld64*"
/opt/bin/x86_64-apple-darwin14-libgfortran3-cxx03/ld64.x86_64-apple-darwin14

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmmm...... looks like I stopped doing this in JuliaPackaging/Yggdrasil@d787aa2#diff-37a7da7ede42eaf0bfe29fb575ba5a7450bbc8a3621dd2a9d758fb04c749d07cL648, but I don't remember what allowed me to get rid of it. In any case, if this passes the shard testsuite, I'm okay with it.

Copy link
Member Author

@giordano giordano Jun 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the macOS linker is used anywhere in our tests, since at the moment this is broken:

sandbox:${WORKSPACE} # echo ${LD}
/opt/x86_64-apple-darwin14/bin/ld64.macos
sandbox:${WORKSPACE} # ls ${LD}
ls: /opt/x86_64-apple-darwin14/bin/ld64.macos: No such file or directory

🙂

mapping["LD"] = "/opt/bin/$(triplet(platform))/ld"
mapping["MACOSX_DEPLOYMENT_TARGET"] = "10.8"
end

Expand Down