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

fix #14182: OS X linker target mismatch warning #22746

Merged
merged 1 commit into from
Jul 11, 2017
Merged

fix #14182: OS X linker target mismatch warning #22746

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
fix #14182: OS X linker target mismatch warning 
fix #14182. ref: ldc-developers/ldc#1209
  • Loading branch information
@ihnorton
ihnorton committed Jul 10, 2017
commit a39d73db501d9493ac8a9023b16659cc4749e13b
1 change: 1 addition & 0 deletions src/jitlayers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,7 @@ void jl_dump_native(const char *bc_fname, const char *unopt_bc_fname, const char
TheTriple.setObjectFormat(Triple::COFF);
#elif defined(_OS_DARWIN_)
TheTriple.setObjectFormat(Triple::MachO);
TheTriple.setOS(llvm::Triple::MacOSX);
Copy link
Member

Choose a reason for hiding this comment

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

In the off chance that Julia works on PureDarwin (I assume no one has ever tried), perhaps this should be in its own #ifdef __APPLE__?

Copy link
Contributor

Choose a reason for hiding this comment

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

same difference

julia/src/support/platform.h

Lines 72 to 73 in 090e549

#elif defined(__APPLE__) && defined(__MACH__)
#define _OS_DARWIN_

Copy link
Member

Choose a reason for hiding this comment

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

Oh cool. Don't mind me then.

#endif
std::unique_ptr<TargetMachine>
TM(jl_TargetMachine->getTarget().createTargetMachine(
Expand Down