diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 6 | ||||
| -rw-r--r-- | mk/validate-settings.mk | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 0005ab00ef..c10378d97a 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -129,6 +129,12 @@ endif PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\ $(SharedLibsPlatformList)),YES,NO) +SharedLibsByDefaultPlatformList = \ + x86_64-unknown-linux + +DYNAMIC_BY_DEFAULT = $(if $(filter $(TARGETPLATFORM),\ + $(SharedLibsByDefaultPlatformList)),YES,NO) + # Build a compiler that will build *unregisterised* libraries and # binaries by default. Unregisterised code is supposed to compile and # run without any support for architecture-specific assembly mangling, diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index a94d2b620b..4baf02ab43 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -26,8 +26,13 @@ GhcStage2HcOpts += -O -fwarn-tabs -dcore-lint # running of the tests, and faster building of the utils to be installed GhcLibHcOpts += -O -dcore-lint + +# We define DefaultFastGhcLibWays in this style so that the value is +# correct even if the user alters DYNAMIC_BY_DEFAULT +DefaultFastGhcLibWays = $(if $(filter $(DYNAMIC_BY_DEFAULT),YES),v dyn,v) + ifeq "$(ValidateSpeed)" "FAST" -GhcLibWays := v +GhcLibWays = $(DefaultFastGhcLibWays) else GhcLibWays := $(filter v dyn,$(GhcLibWays)) endif |