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.

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

Add version string to sysimg triple #51830

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Add version string to sysimg triple #51830

merged 1 commit into from
Oct 24, 2023

Conversation

gbaraldi
Copy link
Member

@gbaraldi gbaraldi commented Oct 23, 2023

Maybe we want to change this to something more dynamic, but this at least avoids the warning

Fixes #51562

@gbaraldi gbaraldi requested a review from vtjnash October 23, 2023 18:03
@@ -1500,7 +1500,13 @@ void jl_dump_native_impl(void *native_code,
TheTriple.setObjectFormat(Triple::COFF);
} else if (TheTriple.isOSDarwin()) {
TheTriple.setObjectFormat(Triple::MachO);
TheTriple.setOS(llvm::Triple::MacOSX);
SmallString<16> Str;
Str += "macosx";
Copy link
Sponsor Member

Choose a reason for hiding this comment

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

This platform doesn't really seem to exist anymore. The last release appears to have been 10.4. The current Apple platform is named darwin and the release numbers of it are of the kernel, so OS 10.14 would correspond to XNU release 18.

Copy link
Member Author

Choose a reason for hiding this comment

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

Annoyingly ld64 still expects it

Copy link
Contributor

Choose a reason for hiding this comment

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

I learnt it the hard way: JuliaPackaging/BinaryBuilderBase.jl#285

@vtjnash vtjnash added the status:merge me PR is reviewed. Merge when all tests are passing label Oct 23, 2023
@gbaraldi gbaraldi merged commit abd00d0 into master Oct 24, 2023
8 checks passed
@gbaraldi gbaraldi deleted the gb/happy-linker branch October 24, 2023 02:31
@oscardssmith oscardssmith removed the status:merge me PR is reviewed. Merge when all tests are passing label Oct 24, 2023
@gbaraldi gbaraldi added the backport 1.10 Change should be backported to the 1.10 release label Mar 19, 2024
KristofferC pushed a commit that referenced this pull request Mar 27, 2024
@KristofferC KristofferC mentioned this pull request Mar 27, 2024
25 tasks
KristofferC added a commit that referenced this pull request Apr 22, 2024
Backported PRs:
- [x] #50759 <!-- Fix outdated usage of scrubbing for log test failures
-->
- [x] #51830 <!-- Add version string to sysimg triple -->
- [x] #53273 <!-- [REPL] Fix typo in using/import completion -->
- [x] #53499 <!-- Avoid compiler warning about redefining jl_globalref_t
-->
- [x] #53424 <!-- yet more atomics & cache-line fixes on work-stealing
queue -->
- [x] #53596 <!-- build: remove extra .a file -->
- [x] #53516 <!-- permit NamedTuple{<:Any, Union{}} to be created -->
- [x] #53643 <!-- Bump CSL to 1.1.1 to fix libgomp bug -->
- [x] #53655 <!-- Change tbaa of ptr_phi to tbaa_value  -->
- [x] #53391 <!-- Default to the medium code model in x86 linux -->
- [x] #53809 <!-- Add missing GC_POP() in emit_cfunction -->
- [x] #53961 <!-- `LazyString` in `LinearAlgebra.checksquare` error
message -->
- [x] #52913 <!-- Added docstring for Artifacts.jl -->
- [x] #53553 <!-- typeintersect: fix `UnionAll` unaliasing bug caused by
@KristofferC KristofferC mentioned this pull request May 8, 2024
23 tasks
@KristofferC KristofferC removed the backport 1.10 Change should be backported to the 1.10 release label May 8, 2024
Drvi pushed a commit to RelationalAI/julia that referenced this pull request Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ld: warning: no platform load command found in sys-o.a assuming macOS
5 participants