diff options
| author | simonmar <unknown> | 2005-01-27 13:01:13 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2005-01-27 13:01:13 +0000 |
| commit | 0287b1b5e18e16f75064331d8d6de35528e9c1fb (patch) | |
| tree | c7b6f6c6408de0221e8220b3a11935aaf6c30227 | |
| parent | 988c661545d1bd6751e3a126d7ba5414d02da070 (diff) | |
| download | haskell-0287b1b5e18e16f75064331d8d6de35528e9c1fb.tar.gz | |
[project @ 2005-01-27 13:00:14 by simonmar]
bootstrapping wibbles
| -rw-r--r-- | ghc/mk/config.mk.in | 6 | ||||
| -rw-r--r-- | mk/bootstrap.mk | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ghc/mk/config.mk.in b/ghc/mk/config.mk.in index 27cfbd7596..c11aae1634 100644 --- a/ghc/mk/config.mk.in +++ b/ghc/mk/config.mk.in @@ -51,7 +51,13 @@ ghc_ge_504 = YES ghc_ge_601 = YES ghc_ge_603 = YES else +ifeq "$(BootingFromHc)" "YES" +ghc_ge_504 = YES +ghc_ge_601 = YES +ghc_ge_603 = YES +else ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi) ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi) ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi) endif +endif
\ No newline at end of file diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index d9a5cbfdd9..af84565457 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: bootstrap.mk,v 1.32 2005/01/27 11:55:37 simonmar Exp $ +# $Id: bootstrap.mk,v 1.33 2005/01/27 13:00:14 simonmar Exp $ # # Makefile rules for booting from .hc files without a driver. # @@ -61,9 +61,6 @@ 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) @@ -72,6 +69,12 @@ 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 -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 endif |