Commit 730f4f24 authored by Simon Marlow's avatar Simon Marlow
Browse files

for the installed versions, don't use dynamic-linking wrappers

parent 2ad3ac2b
...@@ -15,6 +15,13 @@ INSTALL_FLAGS = ...@@ -15,6 +15,13 @@ INSTALL_FLAGS =
endif endif
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 .PHONY: default all with-bootstrapping-compiler with-stage-1 clean distclean
default all: with-bootstrapping-compiler default all: with-bootstrapping-compiler
...@@ -34,7 +41,7 @@ with-stage-1: ...@@ -34,7 +41,7 @@ with-stage-1:
$(USE_STAGE1_CONFIGURE_FLAGS) \ $(USE_STAGE1_CONFIGURE_FLAGS) \
$(COMMON_CONFIGURE_FLAGS) \ $(COMMON_CONFIGURE_FLAGS) \
$(EXTRA_STAGE1_CONFIGURE_FLAGS) $(EXTRA_STAGE1_CONFIGURE_FLAGS)
$(CABAL) build --distpref dist-install $(BUILD_FLAGS) $(CABAL) build --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS)
install: install:
$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \ $(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment