Build fixes
authorIan Lynagh <igloo@earth.li>
Fri, 29 Jun 2012 18:26:14 +0000 (19:26 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 29 Jun 2012 18:26:14 +0000 (19:26 +0100)
compiler/ghc.mk
rules/build-package-data.mk

index 82d9c01..f541841 100644 (file)
@@ -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
index 25b2774..2a6bf67 100644 (file)
@@ -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