[commit: ghc] ghc-7.2: Stop using -Wl,-no_pie on OS X (d02a197)
Ian Lynagh
igloo at earth.li
Wed Aug 3 23:33:32 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/d02a1979d5c5eacd2c5daea7f5852a98988b4d97
>---------------------------------------------------------------
commit d02a1979d5c5eacd2c5daea7f5852a98988b4d97
Author: Ian Lynagh <igloo at earth.li>
Date: Wed Aug 3 20:25:52 2011 +0100
Stop using -Wl,-no_pie on OS X
Now that the in-tree gmp has been upgraded, it should no longer be
necessary, according to #5293.
>---------------------------------------------------------------
compiler/main/DriverPipeline.hs | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index b1f50ac..ebd8d39 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1666,15 +1666,13 @@ 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"]
+ then ["-Wl,-no_compact_unwind"]
else [])
++ o_files
More information about the Cvs-ghc
mailing list