diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-08-03 20:25:52 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-08-03 20:25:52 +0100 |
| commit | 4e044840808ffac427582d288f6de07e2cdd544d (patch) | |
| tree | 11c43e8a7610bb97c5f6cb8888f1154d2e171e82 | |
| parent | 617edd7799da3d5b524385584585e56f25915e5f (diff) | |
| download | haskell-4e044840808ffac427582d288f6de07e2cdd544d.tar.gz | |
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.
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index b1f50acfb8..ebd8d39a5a 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 && + ++ (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 |