diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-19 20:35:19 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-19 20:35:19 +0100 |
| commit | 429c81c5ae861afd0e6910b7c0d331e65e8d4022 (patch) | |
| tree | cff5e73aa7cdff9d42bf8ae4234031066b5a70bb /mk | |
| parent | 8e189a7d9924166e9bb4c4e0200fa64512a7d151 (diff) | |
| parent | 6c547271343be0620503f07508b109b170562af6 (diff) | |
| download | haskell-429c81c5ae861afd0e6910b7c0d331e65e8d4022.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk.sample | 1 | ||||
| -rw-r--r-- | mk/config.mk.in | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 83ff4b7c48..9a4026be48 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -31,6 +31,7 @@ #BuildFlavour = devel2 GhcLibWays = v +DYNAMIC_BY_DEFAULT = NO # -------- 1. A Performance/Distribution build-------------------------------- diff --git a/mk/config.mk.in b/mk/config.mk.in index 93618a9702..debfb165d5 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -130,7 +130,8 @@ PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\ $(SharedLibsPlatformList)),YES,NO) SharedLibsByDefaultPlatformList = \ - x86_64-unknown-linux + x86_64-unknown-linux \ + x86_64-apple-darwin DYNAMIC_BY_DEFAULT = $(if $(filter $(TARGETPLATFORM),\ $(SharedLibsByDefaultPlatformList)),YES,NO) |