Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/d2e7e6e4863f84c21b455ac9bc41bcb26390c555 >--------------------------------------------------------------- commit d2e7e6e4863f84c21b455ac9bc41bcb26390c555 Author: Ian Lynagh <[email protected]> Date: Thu Aug 4 16:36:17 2011 +0100 Revert "Stop using -Wl,-no_pie on OS X" This reverts commit d02a1979d5c5eacd2c5daea7f5852a98988b4d97. Apparently there are still problems with gmp. See #5293 for more details. >--------------------------------------------------------------- compiler/main/DriverPipeline.hs | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index ebd8d39..b1f50ac 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1666,13 +1666,15 @@ 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_compact_unwind"] + then ["-Wl,-no_pie", "-Wl,-no_compact_unwind"] else []) ++ o_files _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
