Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a63970d09627ba75a58316d6779cfe7b7e466da8 >--------------------------------------------------------------- commit a63970d09627ba75a58316d6779cfe7b7e466da8 Author: Ian Lynagh <[email protected]> Date: Fri Jun 29 19:26:14 2012 +0100 Build fixes >--------------------------------------------------------------- compiler/ghc.mk | 4 ++++ rules/build-package-data.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 82d9c01..f541841 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -310,6 +310,9 @@ ifeq "$(GhcWithInterpreter)" "YES" compiler_stage2_CONFIGURE_OPTS += --flags=ghci ifeq "$(BuildSharedLibs)" "YES" +# There are too many symbols to make a Windows DLL for the ghc package, +# so we don't build it the dyn way; see trac #5987 +ifneq "$(TargetOS_CPP)" "mingw32" compiler_stage2_CONFIGURE_OPTS += --enable-shared # If we are going to use dynamic libraries instead of .o files for ghci, # we will need to always retain CAFs in the compiler. @@ -318,6 +321,7 @@ compiler_stage2_CONFIGURE_OPTS += --enable-shared # code is run. compiler_stage2_CONFIGURE_OPTS += --flags=dynlibs endif +endif ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" # Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 25b2774..2a6bf67 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -18,11 +18,11 @@ $(call profStart, build-package-data($1,$2,$3)) # $2 = distdir # $3 = GHC stage to use (0 == bootstrapping compiler) -ifeq "$$(filter p,$$(GhcLibWays))" "p" +ifeq "$$(filter p,$$($1_$2_WAYS))" "p" $1_$2_CONFIGURE_OPTS += --enable-library-profiling endif -ifeq "$$(filter dyn,$$(GhcLibWays))" "dyn" +ifeq "$$(filter dyn,$$($1_$2_WAYS)))" "dyn" $1_$2_CONFIGURE_OPTS += --enable-shared endif _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
