Commit be6810bb authored by Simon Peyton Jones's avatar Simon Peyton Jones

Merge branch 'master' of http://darcs.haskell.org/ghc

parents 3e9679af 30ccc9f3
......@@ -1666,6 +1666,17 @@ linkBinary dflags o_files dep_packages = do
then ["-Wl,--enable-auto-import"]
else [])
-- '-no_pie' - On OS X, the linker otherwise complains that it cannot build
-- position independent code due to some offensive code in GMP.
-- '-no_compact_unwind'
-- - C++/Objective-C exceptions cannot use optimised stack
-- unwinding code (the optimised form is the default in Xcode 4 on
-- x86_64).
++ (if platformOS (targetPlatform dflags) == OSDarwin &&
platformArch (targetPlatform dflags) == ArchX86_64
then ["-Wl,-no_pie", "-Wl,-no_compact_unwind"]
else [])
++ o_files
++ extra_ld_inputs
++ lib_path_opts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment