X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=865f3d3c2075b8ee2ba7357f9b3245e806ef60a0;hb=9fcdd13a743a2c982e999638f3d5c18e172eedf0;hp=32d131313155ac8801d9f16124ecea429de131ef;hpb=c872dd3e96aeacfeff2c7e4f3991aa28cd6d4734;p=ghc-hetmet.git diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 32d1313..865f3d3 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: bootstrap.mk,v 1.29 2004/01/15 18:04:45 ross Exp $ +# $Id: bootstrap.mk,v 1.34 2005/05/10 10:29:49 simonmar Exp $ # # Makefile rules for booting from .hc files without a driver. # @@ -8,15 +8,6 @@ # compile the .hc files, so we have to duplicate that functionality here. # The result is unfortunately ugly, but we don't have another choice. -TOP_SAVED := $(TOP) -TOP:=$(TOP)/ghc - -include $(TOP)/mk/version.mk -include $(TOP)/mk/paths.mk - -# Reset TOP -TOP:=$(TOP_SAVED) - # ----------------------------------------------------------------------------- # Set the platform-specific options to send to the C compiler. These should # match the list in machdepCCOpts in ghc/compiler/DriverFlags.hs. @@ -27,11 +18,15 @@ PLATFORM_HC_BOOT_CC_OPTS = ifeq "$(i386_TARGET_ARCH)" "1" PLATFORM_CC_OPTS += -DDONT_WANT_WIN32_DLL_SUPPORT -PLATFORM_HC_BOOT_CC_OPTS += -fno-defer-pop -fomit-frame-pointer +PLATFORM_HC_BOOT_CC_OPTS += -fno-defer-pop -fomit-frame-pointer -fno-builtin +endif + +ifeq "$(x86_64_TARGET_ARCH)" "1" +PLATFORM_HC_BOOT_CC_OPTS += -fomit-frame-pointer -fno-asynchronous-unwind-tables -fno-unit-at-a-time -fno-builtin endif ifeq "$(hppa_TARGET_ARCH)" "1" -PLATFORM_CC_OPTS += -static -D_HPUX_SOURCE +PLATFORM_CC_OPTS += -D_HPUX_SOURCE endif ifeq "$(powerpc_TARGET_ARCH)" "1" @@ -44,10 +39,6 @@ PLATFORM_CC_OPTS += -static PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive endif -ifeq "$(mingw32_TARGET_OS)" "1" -PLATFORM_CC_OPTS += -mno-cygwin -endif - ifeq "$(alpha_TARGET_ARCH)" "1" PLATFORM_CC_OPTS += -static -w PLATFORM_HC_BOOT_CC_OPTS += -mieee @@ -59,16 +50,19 @@ endif ifeq "$(BootingFromUnregisterisedHc)" "YES" PLATFORM_HC_BOOT_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -# Add these flags to SRC_CC_OPTS too, because they need to be passed to the plain .c -# files in ghc/rts. endif PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS) $(CC_OPTS) -SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include +SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL) -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include -I$(FPTOOLS_TOP_ABS)/libraries/parsec/include + +# C code compiled with UseGhcForCc=YES assumes the existence of certain CPP +# symbols defined by GHC (eg. __GLASGOW_HASKELL__), so we better make sure +# they're defined. We can't test $(UseGhcForCc) here though - it isn't defined +# yet, so we use lazy expansion. +SRC_CC_OPTS += $(if $(findstring YES,$(UseGhcForCc)), $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS)) ifeq "$(GhcWithInterpreter)" "YES" SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/libraries/readline/include @@ -84,15 +78,20 @@ UNDERSCORE= endif ifeq "$(HaveLibGmp)" "NO" -DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp +DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)/gmp endif HC_BOOT_LD_OPTS = \ - -L$(FPTOOLS_TOP_ABS)/ghc/rts \ + -L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL) \ $(DASH_L_GHC_RTS_GMP_DIR) \ -L$(FPTOOLS_TOP_ABS)/libraries/base \ -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits \ - -L$(FPTOOLS_TOP_ABS)/libraries/haskell98 + -L$(FPTOOLS_TOP_ABS)/libraries/haskell98 \ + -L$(FPTOOLS_TOP_ABS)/libraries/parsec \ + -L$(FPTOOLS_TOP_ABS)/libraries/regex-base \ + -L$(FPTOOLS_TOP_ABS)/libraries/regex-posix \ + -L$(FPTOOLS_TOP_ABS)/libraries/regex-compat \ + -L$(FPTOOLS_TOP_ABS)/libraries/Cabal ifeq "$(GhcWithInterpreter)" "YES" HC_BOOT_LD_OPTS += \ @@ -103,36 +102,36 @@ HC_BOOT_LD_OPTS += \ endif HC_BOOT_LD_OPTS += \ - -u "$(UNDERSCORE)GHCziBase_Izh_static_info" \ - -u "$(UNDERSCORE)GHCziBase_Czh_static_info" \ - -u "$(UNDERSCORE)GHCziFloat_Fzh_static_info" \ - -u "$(UNDERSCORE)GHCziFloat_Dzh_static_info" \ - -u "$(UNDERSCORE)GHCziPtr_Ptr_static_info" \ - -u "$(UNDERSCORE)GHCziWord_Wzh_static_info" \ - -u "$(UNDERSCORE)GHCziInt_I8zh_static_info" \ - -u "$(UNDERSCORE)GHCziInt_I16zh_static_info" \ - -u "$(UNDERSCORE)GHCziInt_I32zh_static_info" \ - -u "$(UNDERSCORE)GHCziInt_I64zh_static_info" \ - -u "$(UNDERSCORE)GHCziWord_W8zh_static_info" \ - -u "$(UNDERSCORE)GHCziWord_W16zh_static_info" \ - -u "$(UNDERSCORE)GHCziWord_W32zh_static_info" \ - -u "$(UNDERSCORE)GHCziWord_W64zh_static_info" \ - -u "$(UNDERSCORE)GHCziStable_StablePtr_static_info" \ - -u "$(UNDERSCORE)GHCziBase_Izh_con_info" \ - -u "$(UNDERSCORE)GHCziBase_Czh_con_info" \ - -u "$(UNDERSCORE)GHCziFloat_Fzh_con_info" \ - -u "$(UNDERSCORE)GHCziFloat_Dzh_con_info" \ - -u "$(UNDERSCORE)GHCziPtr_Ptr_con_info" \ - -u "$(UNDERSCORE)GHCziStable_StablePtr_con_info" \ - -u "$(UNDERSCORE)GHCziBase_False_closure" \ - -u "$(UNDERSCORE)GHCziBase_True_closure" \ - -u "$(UNDERSCORE)GHCziPack_unpackCString_closure" \ - -u "$(UNDERSCORE)GHCziIOBase_stackOverflow_closure" \ - -u "$(UNDERSCORE)GHCziIOBase_heapOverflow_closure" \ - -u "$(UNDERSCORE)GHCziIOBase_NonTermination_closure" \ - -u "$(UNDERSCORE)GHCziIOBase_BlockedOnDeadMVar_closure" \ - -u "$(UNDERSCORE)GHCziIOBase_Deadlock_closure" \ - -u "$(UNDERSCORE)GHCziWeak_runFinalizzerBatch_closure" \ + -u "$(UNDERSCORE)base_GHCziBase_Izh_static_info" \ + -u "$(UNDERSCORE)base_GHCziBase_Czh_static_info" \ + -u "$(UNDERSCORE)base_GHCziFloat_Fzh_static_info" \ + -u "$(UNDERSCORE)base_GHCziFloat_Dzh_static_info" \ + -u "$(UNDERSCORE)base_GHCziPtr_Ptr_static_info" \ + -u "$(UNDERSCORE)base_GHCziWord_Wzh_static_info" \ + -u "$(UNDERSCORE)base_GHCziInt_I8zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziInt_I16zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziInt_I32zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziInt_I64zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziWord_W8zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziWord_W16zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziWord_W32zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziWord_W64zh_static_info" \ + -u "$(UNDERSCORE)base_GHCziStable_StablePtr_static_info" \ + -u "$(UNDERSCORE)base_GHCziBase_Izh_con_info" \ + -u "$(UNDERSCORE)base_GHCziBase_Czh_con_info" \ + -u "$(UNDERSCORE)base_GHCziFloat_Fzh_con_info" \ + -u "$(UNDERSCORE)base_GHCziFloat_Dzh_con_info" \ + -u "$(UNDERSCORE)base_GHCziPtr_Ptr_con_info" \ + -u "$(UNDERSCORE)base_GHCziStable_StablePtr_con_info" \ + -u "$(UNDERSCORE)base_GHCziBase_False_closure" \ + -u "$(UNDERSCORE)base_GHCziBase_True_closure" \ + -u "$(UNDERSCORE)base_GHCziPack_unpackCString_closure" \ + -u "$(UNDERSCORE)base_GHCziIOBase_stackOverflow_closure" \ + -u "$(UNDERSCORE)base_GHCziIOBase_heapOverflow_closure" \ + -u "$(UNDERSCORE)base_GHCziIOBase_nonTermination_closure" \ + -u "$(UNDERSCORE)base_GHCziIOBase_BlockedOnDeadMVar_closure" \ + -u "$(UNDERSCORE)base_GHCziIOBase_Deadlock_closure" \ + -u "$(UNDERSCORE)base_GHCziWeak_runFinalizzerBatch_closure" \ -u "$(UNDERSCORE)__stginit_Prelude" @@ -142,7 +141,7 @@ ifeq "$(GhcWithInterpreter)" "YES" HC_BOOT_LIBS += -lHSreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits endif -HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) +HC_BOOT_LIBS += -lHSregex-compat -lHSregex-posix -lHSregex-base -lHSCabal -lHShaskell98 -lHSbase -lHSbase_cbits -lHSparsec -lHSrts -lgmp -lm -lrt $(EXTRA_HC_BOOT_LIBS) ifeq "$(GhcLibsWithReadline)" "YES" HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))