projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2ad3ac2
)
for the installed versions, don't use dynamic-linking wrappers
author
Simon Marlow
<marlowsd@gmail.com>
Fri, 25 Jul 2008 13:45:51 +0000
(13:45 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Fri, 25 Jul 2008 13:45:51 +0000
(13:45 +0000)
mk/cabal.mk
patch
|
blob
|
history
diff --git
a/mk/cabal.mk
b/mk/cabal.mk
index
f8d2b7b
..
98b985b
100644
(file)
--- a/
mk/cabal.mk
+++ b/
mk/cabal.mk
@@
-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
default all: with-bootstrapping-compiler
.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)
$(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)' \
install:
$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \