Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3c45e5a0fc97a25c6743daeac9de1149322e9f9f

>---------------------------------------------------------------

commit 3c45e5a0fc97a25c6743daeac9de1149322e9f9f
Author: Ian Lynagh <[email protected]>
Date:   Sun Oct 14 01:08:35 2012 +0100

    Fix installing when dynlibs-by-default

>---------------------------------------------------------------

 rules/build-package-data.mk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 817128e..6f151a5 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -26,10 +26,11 @@ ifeq "$$(filter dyn,$$($1_$2_WAYS))" "dyn"
 $1_$2_CONFIGURE_OPTS += --enable-shared
 endif
 
+$1_$2_CONFIGURE_OPTS += --disable-library-for-ghci
 ifeq "$$(GhcWithInterpreter)" "YES"
+ifneq "$$(DYNAMIC_BY_DEFAULT)" "YES"
 $1_$2_CONFIGURE_OPTS += --enable-library-for-ghci
-else
-$1_$2_CONFIGURE_OPTS += --disable-library-for-ghci
+endif
 endif
 
 ifeq "$$(HSCOLOUR_SRCS)" "YES"



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to