X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=5387c8bcfc959e1dc959119b5629f50b9e442e2c;hb=02ec37666737ddca8d59ad4ba89ca8b0f12244e2;hp=486e2b6dde0f0074b427333d26894bf64100374e;hpb=704041f743ce0a6a67828b890ced3e556bbfff79;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 486e2b6..5387c8b 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -46,7 +46,18 @@ endif
 $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	"$(RM)" $(RM_OPTS) $@
 	@echo 'Creating $@ ... '
+	@echo '{-# LANGUAGE CPP #-}'                                        >> $@
 	@echo 'module Config where'                                         >> $@
+	@echo                                                               >> $@
+	@echo '#include "ghc_boot_platform.h"'                              >> $@
+	@echo                                                               >> $@
+	@echo 'cBuildPlatform :: String'                                    >> $@
+	@echo 'cBuildPlatform = BuildPlatform_NAME'                         >> $@
+	@echo 'cHostPlatform :: String'                                     >> $@
+	@echo 'cHostPlatform = HostPlatform_NAME'                           >> $@
+	@echo 'cTargetPlatform :: String'                                   >> $@
+	@echo 'cTargetPlatform = TargetPlatform_NAME'                       >> $@
+	@echo                                                               >> $@
 	@echo 'cProjectName          :: String'                             >> $@
 	@echo 'cProjectName          = "$(ProjectName)"'                    >> $@
 	@echo 'cProjectVersion       :: String'                             >> $@
@@ -340,12 +351,7 @@ else
 compiler_CONFIGURE_OPTS += --ghc-option=-DNO_REGS
 endif
 
-# We need to turn on profiling either if we have been asked to
-# (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
-# profiling enabled (GhcProfiled = YES).
-ifneq "$(GhcLibProfiled) $(GhcProfiled)" "NO NO"
-compiler_stage2_CONFIGURE_OPTS += --enable-library-profiling
-# And if we're profiling GHC then we want lots of SCCs.
+# If we're profiling GHC then we want lots of SCCs, so -auto-all
 # We also don't want to waste time building the non-profiling library,
 # either normally or for ghci. Unfortunately this means that we have to
 # tell ghc-pkg --force as it gets upset when libHSghc-6.9.a doesn't
@@ -356,7 +362,6 @@ compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
 compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci
 compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force
 endif
-endif
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 # The #include is vital for the via-C route with older compilers, else the C