From 2be38ab276420e63a6b684f659e71756caac780a Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Wed, 11 Jan 2012 18:06:56 +0100 Subject: remove legacy clean --- compiler/ghc.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index e305b36a8e..cf10417904 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------------- # -# (c) 2009 The University of Glasgow +# (c) 2009-2012 The University of Glasgow # # This file is part of the GHC build system. # @@ -137,9 +137,6 @@ else endif @echo done. -# XXX 2010-08-19: This is a legacy clean. Remove later. -$(eval $(call clean-target,compiler,config_hs,compiler/main/Config.hs)) - # ----------------------------------------------------------------------------- # Create platform includes -- cgit v1.2.1 From 668aef9a1bac6990cd7b0fc8537c789a7ff16e4d Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Thu, 12 Jan 2012 20:13:44 +0100 Subject: two typos --- compiler/ghc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index cf10417904..014094c1d5 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -357,7 +357,7 @@ compiler/main/DriverPipeline_HC_OPTS += -auto-all compiler/main/GhcMake_HC_OPTS += -auto-all compiler/main/GHC_HC_OPTS += -auto-all -# or alternatively addd {-# OPTIONS_GHC -auto-all #-} to the top of +# or alternatively add {-# OPTIONS_GHC -auto-all #-} to the top of # modules you're interested in. # We seem to still build the vanilla libraries even if we say -- cgit v1.2.1 From ad752fd3453569af129d8ff270f7707bf6535f11 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 17 Mar 2012 14:55:16 +0000 Subject: Fix building with devel snapshots --- compiler/ghc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 014094c1d5..b4b3c0e924 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -405,8 +405,9 @@ endif endif ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES" +compiler_stage1_MUNGED_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion)) define compiler_PACKAGE_MAGIC -compiler_stage1_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion)) +compiler_stage1_VERSION = $(compiler_stage1_MUNGED_VERSION) endef # Don't register the non-munged package -- cgit v1.2.1 From 226b982233adbc1feff01f7b368ac1070a8ef2c3 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 1 Apr 2012 12:38:25 +0100 Subject: Remove an unused make variable --- compiler/ghc.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index b4b3c0e924..505c985bbe 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -27,8 +27,6 @@ endef # The 'echo' commands simply spit the values of various make variables # into Config.hs, whence they can be compiled and used by GHC itself -compiler_CONFIG_HS = compiler/main/Config.hs - # This is just to avoid generating a warning when generating deps # involving RtsFlags.h compiler_stage1_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES -- cgit v1.2.1 From f3c24c53bcbd029f107476e24cf048b221e1cb94 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 4 May 2012 16:26:59 +0100 Subject: Follow libffi changes on Windows --- compiler/ghc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 505c985bbe..e4a8368795 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -497,7 +497,7 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" define windowsDynLinkToFfi # $1 = way ifneq "$$(findstring dyn, $1)" "" -compiler_stage2_$1_ALL_HC_OPTS += -lffi-5 +compiler_stage2_$1_ALL_HC_OPTS += -l$$(LIBFFI_WINDOWS_LIB) endif endef $(foreach way,$(GhcLibWays),$(eval $(call windowsDynLinkToFfi,$(way)))) -- cgit v1.2.1 From 88f694dd488bfe475c7dfac20ad47781c5689785 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 4 May 2012 20:07:56 +0100 Subject: Enable and fix building dynlibs on Win64 --- compiler/ghc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index e4a8368795..a3005db41b 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -493,7 +493,7 @@ compiler/main/Constants_HC_OPTS += -fforce-recomp # LibFFI.hs #includes ffi.h compiler/stage2/build/LibFFI.hs : $(libffi_HEADERS) # On Windows it seems we also need to link directly to libffi -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifeq "$(HostOS_CPP)" "mingw32" define windowsDynLinkToFfi # $1 = way ifneq "$$(findstring dyn, $1)" "" -- cgit v1.2.1 From 6c29fad6a1ab20e8cfed5ad4af406a821ee74291 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 29 Jun 2012 17:47:32 +0100 Subject: Don't build the ghc DLL on Windows; works around trac #5987 We also don't build DLLs for the dph-lifted-* packages as they depend on ghc. --- compiler/ghc.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index a3005db41b..82d9c01ed9 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -423,6 +423,14 @@ compiler_stage1_SplitObjs = NO compiler_stage2_SplitObjs = NO compiler_stage3_SplitObjs = NO +ifeq "$(TargetOS_CPP)" "mingw32" +# 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 +compiler_stage1_EXCLUDED_WAYS := dyn +compiler_stage2_EXCLUDED_WAYS := dyn +compiler_stage3_EXCLUDED_WAYS := dyn +endif + # if stage is set to something other than "1" or "", disable stage 1 ifneq "$(filter-out 1,$(stage))" "" compiler_stage1_NOT_NEEDED = YES -- cgit v1.2.1 From a63970d09627ba75a58316d6779cfe7b7e466da8 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 29 Jun 2012 19:26:14 +0100 Subject: Build fixes --- compiler/ghc.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'compiler/ghc.mk') diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 82d9c01ed9..f541841046 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 -- cgit v1.2.1