diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2008-07-25 13:45:51 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2008-07-25 13:45:51 +0000 |
| commit | 730f4f24c453d9396d28dee411425184e560cf3c (patch) | |
| tree | 5695f8c12828c0c1974671741e326234d462e5af /mk | |
| parent | 2ad3ac2baca1c6fd0d69f3417fa62ae10cffcf49 (diff) | |
| download | haskell-730f4f24c453d9396d28dee411425184e560cf3c.tar.gz | |
for the installed versions, don't use dynamic-linking wrappers
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cabal.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mk/cabal.mk b/mk/cabal.mk index f8d2b7b091..98b985bb97 100644 --- a/mk/cabal.mk +++ b/mk/cabal.mk @@ -15,6 +15,13 @@ INSTALL_FLAGS = endif endif +# Tell stage1 to make a dynamically-linked binary, but no wrapper. We assume +# that in an installation the shared libs will be installed somewhere that +# the system can find them. +ifeq "$(BuildSharedLibs)" "YES" +DYN_FLAGS = --ghc-option=-dynamic --ghc-option=-dynload --ghc-option=deploy +endif + .PHONY: default all with-bootstrapping-compiler with-stage-1 clean distclean default all: with-bootstrapping-compiler @@ -34,7 +41,7 @@ with-stage-1: $(USE_STAGE1_CONFIGURE_FLAGS) \ $(COMMON_CONFIGURE_FLAGS) \ $(EXTRA_STAGE1_CONFIGURE_FLAGS) - $(CABAL) build --distpref dist-install $(BUILD_FLAGS) + $(CABAL) build --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS) install: $(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \ |