|
| 1 | +diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in |
| 2 | +index 4912673869..85b5c58c2a 100644 |
| 3 | +--- a/hadrian/cfg/system.config.in |
| 4 | ++++ b/hadrian/cfg/system.config.in |
| 5 | +@@ -18,6 +18,7 @@ merge-objects = @MergeObjsCmd@ |
| 6 | + system-merge-objects = @LD_STAGE0@ |
| 7 | + objdump = @ObjdumpCmd@ |
| 8 | + ranlib = @REAL_RANLIB_CMD@ |
| 9 | ++strip = @StripCmd@ |
| 10 | + sphinx-build = @SPHINXBUILD@ |
| 11 | + system-ar = @AR_STAGE0@ |
| 12 | + system-cc = @CC_STAGE0@ |
| 13 | +diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs |
| 14 | +index a0f639d325..55f9a2f902 100644 |
| 15 | +--- a/hadrian/src/Oracles/Setting.hs |
| 16 | ++++ b/hadrian/src/Oracles/Setting.hs |
| 17 | +@@ -73,6 +73,7 @@ data Setting = BuildArch |
| 18 | + | ProjectPatchLevel |
| 19 | + | ProjectPatchLevel1 |
| 20 | + | ProjectPatchLevel2 |
| 21 | ++ | Strip |
| 22 | + | SystemGhc |
| 23 | + | TargetArch |
| 24 | + | TargetOs |
| 25 | +@@ -176,6 +177,7 @@ setting key = lookupSystemConfig $ case key of |
| 26 | + ProjectPatchLevel -> "project-patch-level" |
| 27 | + ProjectPatchLevel1 -> "project-patch-level1" |
| 28 | + ProjectPatchLevel2 -> "project-patch-level2" |
| 29 | ++ Strip -> "strip" |
| 30 | + SystemGhc -> "system-ghc" |
| 31 | + TargetArch -> "target-arch" |
| 32 | + TargetArmVersion -> "target-arm-version" |
| 33 | +diff --git a/hadrian/src/Settings/Builders/Cabal.hs b/hadrian/src/Settings/Builders/Cabal.hs |
| 34 | +index 75eb78ccd8..6904c973d4 100644 |
| 35 | +--- a/hadrian/src/Settings/Builders/Cabal.hs |
| 36 | ++++ b/hadrian/src/Settings/Builders/Cabal.hs |
| 37 | +@@ -85,15 +85,11 @@ commonCabalArgs :: Stage -> Args |
| 38 | + commonCabalArgs stage = do |
| 39 | + verbosity <- expr getVerbosity |
| 40 | + pkg <- getPackage |
| 41 | ++ strip <- getSetting Strip |
| 42 | + package_id <- expr $ pkgUnitId stage pkg |
| 43 | + let prefix = "${pkgroot}" ++ (if windowsHost then "" else "/..") |
| 44 | +- mconcat [ -- Don't strip libraries when cross compiling. |
| 45 | +- -- TODO: We need to set @--with-strip=(stripCmdPath :: Action FilePath)@, |
| 46 | +- -- and if it's @:@ disable stripping as well. As it is now, I believe |
| 47 | +- -- we might have issues with stripping on Windows, as I can't see a |
| 48 | +- -- consumer of 'stripCmdPath'. |
| 49 | +- -- TODO: See https://github.com/snowleopard/hadrian/issues/549. |
| 50 | +- flag CrossCompiling ? pure [ "--disable-executable-stripping" |
| 51 | ++ mconcat [ notStage0 ? strip /= "" ? pure [ "--with-strip=" ++ strip ] |
| 52 | ++ , flag CrossCompiling ? pure [ "--disable-executable-stripping" |
| 53 | + , "--disable-library-stripping" ] |
| 54 | + -- We don't want to strip the debug RTS |
| 55 | + , S.package rts ? pure [ "--disable-executable-stripping" |
0 commit comments