diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-16 18:30:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-16 18:30:20 +0000 |
| commit | 81e5f8ff44ed5c734c9966ba0f3faf2d84c74577 (patch) | |
| tree | 65f65c04ff17084e128cede35d377795be2f9d94 /ghc/ghc.mk | |
| parent | fc15f6e876f3b8202a1053f809253b39dc8a8923 (diff) | |
| download | haskell-81e5f8ff44ed5c734c9966ba0f3faf2d84c74577.tar.gz | |
Bootstrapping fixes
Diffstat (limited to 'ghc/ghc.mk')
| -rw-r--r-- | ghc/ghc.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index c9313948ce..103c590652 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -120,9 +120,15 @@ $(INPLACE_LIB)/extra-gcc-opts : extra-gcc-opts $(CP) $< $@ # The GHC programs need to depend on all the helper programs they might call -$(GHC_STAGE1) : $(INPLACE_LIB)/extra-gcc-opts $(MANGLER) $(SPLIT) -$(GHC_STAGE2) : $(INPLACE_LIB)/extra-gcc-opts $(MANGLER) $(SPLIT) -$(GHC_STAGE3) : $(INPLACE_LIB)/extra-gcc-opts $(MANGLER) $(SPLIT) +ifeq "$(GhcUnregisterised)" "NO" +$(GHC_STAGE1) : $(MANGLER) $(SPLIT) +$(GHC_STAGE2) : $(MANGLER) $(SPLIT) +$(GHC_STAGE3) : $(MANGLER) $(SPLIT) +endif + +$(GHC_STAGE1) : $(INPLACE_LIB)/extra-gcc-opts +$(GHC_STAGE2) : $(INPLACE_LIB)/extra-gcc-opts +$(GHC_STAGE3) : $(INPLACE_LIB)/extra-gcc-opts ifeq "$(Windows)" "YES" $(GHC_STAGE1) : $(TOUCHY) $(INPLACE)/stamp-mingw $(INPLACE_LIB)/perl.exe @@ -130,6 +136,10 @@ $(GHC_STAGE2) : $(TOUCHY) $(INPLACE)/stamp-mingw $(INPLACE_LIB)/perl.exe $(GHC_STAGE3) : $(TOUCHY) $(INPLACE)/stamp-mingw $(INPLACE_LIB)/perl.exe endif +ifeq "$(BootingFromHc)" "YES" +ghc_stage2_OTHER_OBJS += $(compiler_stage2_v_LIB) $(ALL_LIBS) $(ALL_LIBS) $(ALL_LIBS) $(ALL_RTS_LIBS) -lgmp $(libffi_STATIC_LIB) -lm -lutil -lrt +endif + endif INSTALL_LIBS += extra-gcc-opts |