diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-10-14 21:29:09 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-10-14 21:29:09 +0100 |
| commit | b15f7f338a1ab20cae8990f76296121e59a80c1d (patch) | |
| tree | 0ea91d62bb159903986e8e4c70a1c015f4bdba02 | |
| parent | e66a58d6554723798aa84f0438cd8f0fc39142d2 (diff) | |
| parent | bdb0bba0ce4cd33195955bfb0d13191d62ed6cd9 (diff) | |
| download | haskell-b15f7f338a1ab20cae8990f76296121e59a80c1d.tar.gz | |
Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.
| -rw-r--r-- | mk/validate-settings.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 00d465708a..e42c6c593f 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -27,7 +27,12 @@ GhcStage2HcOpts += -O # running of the tests, and faster building of the utils to be installed GhcLibHcOpts += -O -dcore-lint +ifeq "$(Windows)" "YES" +# This is a temporary hack to workaround a libffi build problem +GhcLibWays := $(filter v,$(GhcLibWays)) +else GhcLibWays := $(filter v dyn,$(GhcLibWays)) +endif SplitObjs = NO NoFibWays = STRIP_CMD = : |