Rename some variables from FOO to FOO_CMD

[ghc-hetmet.git] / mk / validate-settings.mk

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 322aaef..31c8853 100644 (file)
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -5,20 +5,20 @@ WERROR          = -Werror
 
 HADDOCK_DOCS    = YES
 SRC_CC_OPTS     += -Wall $(WERROR)
-SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0 -fasm
+SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0
 
-GhcStage1HcOpts += -O -fasm
+GhcStage1HcOpts += -O
 
-GhcStage2HcOpts += -O -fasm
+GhcStage2HcOpts += -O
 # Using -O (rather than -O0) here bringes my validate down from 22mins to 16 mins.
 # Compiling stage2 takes longer, but we gain a faster haddock, faster
 # running of the tests, and faster building of the utils to be installed
 
-GhcLibHcOpts    += -O -fasm -dcore-lint
+GhcLibHcOpts    += -O -dcore-lint
 GhcLibWays     := $(filter v dyn,$(GhcLibWays))
 SplitObjs       = NO
 NoFibWays       =
-STRIP           = :
+STRIP_CMD       = :
 
 CHECK_PACKAGES = YES