diff options
| author | Ian Lynagh <igloo@earth.li> | 2006-10-03 12:42:32 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2006-10-03 12:42:32 +0000 |
| commit | 08f6d46191ffd7a4e9f215aadcd253ba42bbda3e (patch) | |
| tree | ef4a4cf5ca03e92fe71d61a291ee2b395e4f6496 /mk | |
| parent | c248518fe81b6d2807d3bcbb8a09ae14facce1ad (diff) | |
| download | haskell-08f6d46191ffd7a4e9f215aadcd253ba42bbda3e.tar.gz | |
Fixes for the porting process for 6.6
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bootstrap.mk | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index d0713311b9..46267959c8 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -92,6 +92,9 @@ HC_BOOT_LD_OPTS = \ -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits \ -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" @@ -103,36 +106,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 +145,7 @@ ifeq "$(GhcWithInterpreter)" "YES" HC_BOOT_LIBS += -lHSreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits endif -HC_BOOT_LIBS += -lHSCabal -lHShaskell98 -lHSbase -lHSbase_cbits -lHSparsec -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)) |