diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-09-05 18:46:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-09-05 18:46:14 +0000 |
| commit | 0e86b6601ea17d89c7f46b3a902093d4c6020da8 (patch) | |
| tree | 6830814c3c54f0b6e1aa9b597f654c83dbc07b80 | |
| parent | d3b882ae7fc0d4b499f194cc1914cc4562ebbd7c (diff) | |
| download | haskell-0e86b6601ea17d89c7f46b3a902093d4c6020da8.tar.gz | |
Build settings for validation are now in mk/validate-settings.mk
| -rw-r--r-- | mk/boilerplate.mk | 5 | ||||
| -rw-r--r-- | mk/validate-settings.mk | 12 | ||||
| -rw-r--r-- | validate | 19 |
3 files changed, 19 insertions, 17 deletions
diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk index 9603bf255f..14194fbd22 100644 --- a/mk/boilerplate.mk +++ b/mk/boilerplate.mk @@ -70,9 +70,14 @@ ifeq "$(BootingFromHc)" "YES" include $(TOP)/mk/bootstrap.mk endif +ifeq "$(Validating)" "YES" +include $(TOP)/mk/validate-settings.mk +-include $(TOP)/mk/validate.mk +else -include $(TOP)/mk/build.mk # (Optional) build-specific configuration # +endif ifndef FAST -include .depend diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk new file mode 100644 index 0000000000..394fa9d258 --- /dev/null +++ b/mk/validate-settings.mk @@ -0,0 +1,12 @@ + +HADDOCK_DOCS = YES +SRC_CC_OPTS = -Werror +SRC_HC_OPTS = -Werror -H64m -Onot -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -Onot -fasm +GhcLibHcOpts = -O -fasm +GhcLibWays = +SplitObjs = NO +NoFibWays = +STRIP=: + @@ -6,21 +6,6 @@ if [ -f mk/config.mk ]; then make distclean fi -if [ -f mk/build.mk ]; then - mv mk/build.mk mk/build.mk.bak -fi - -# The default is a "quick" build -echo "BuildFlavour = quick" > mk/build.mk -echo "HADDOCK_DOCS = YES" >> mk/build.mk -cat mk/build.mk.sample >> mk/build.mk -echo "SRC_HC_OPTS += -Werror" >> mk/build.mk -echo "SRC_CC_OPTS += -Werror" >> mk/build.mk - -# You can override the default validate settings using mk/validate.mk -# e.g. you could add GhcLibWays=p to test profiling. -echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk - case $OSTYPE in cygwin|msys) config_args=--build=i386-unknown-mingw32 if [ -f c:/mingw/bin/gcc.exe ]; then @@ -38,10 +23,10 @@ fi sh boot ./configure $config_args -make -j$threads +make Validating=YES -j$threads # ToDo: use THREADS=$threads, see #1558 -make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog +make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog if grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null && |