diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-25 19:50:09 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-03 12:11:28 +0100 |
| commit | 898cb090c8812704448ec4cb1c10d50df4b7d664 (patch) | |
| tree | 526c5f4b47aee447d91af7ce83a819863f105804 /mk/validate-settings.mk | |
| parent | 58eaacc9967b7c627a66d49047fb447ac065706e (diff) | |
| download | haskell-898cb090c8812704448ec4cb1c10d50df4b7d664.tar.gz | |
Build the dynamic way by default on Linux/amd64
This required various build system changes to get the build to go
through.
In the inplace shell wrappers, we set LD_LIBRARY_PATH to allow programs
to find their libraries. In the future, we might change the inplace tree
to be the same shape as an installed tree instead. However, this would
mean changing the way we do installation, as currently we use cabal's
installation methods to install the libraries, but that only works if
the libraries are under libraries/foo/dist-install/build/..., rather
than in inplace/lib/...
Diffstat (limited to 'mk/validate-settings.mk')
| -rw-r--r-- | mk/validate-settings.mk | 7 |
1 files changed, 6 insertions, 1 deletions
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 |