patches/patch-aa

   1 $NetBSD$
   2
   3 --- ../ghc-6.6.1/mk/bootstrap.mk.orig   2007-04-26 02:10:40.000000000 +0900
   4 +++ ../ghc-6.6.1/mk/bootstrap.mk
   5 @@ -30,7 +30,6 @@ PLATFORM_CC_OPTS += -D_HPUX_SOURCE
   6  endif
   7
   8  ifeq "$(powerpc_TARGET_ARCH)" "1"
   9 -PLATFORM_CC_OPTS += -static
  10  PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive
  11  endif
  12
  13 @@ -68,10 +67,6 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/$(GH
  14  # yet, so we use lazy expansion.
  15  SRC_CC_OPTS += $(if $(findstring YES,$(UseGhcForCc)), $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS))
  16
  17 -ifeq "$(GhcWithInterpreter)" "YES"
  18 -SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/libraries/readline/include
  19 -endif
  20 -
  21  # -----------------------------------------------------------------------------
  22  # Linking: we have to give all the libraries explicitly.
  23
  24 @@ -100,7 +95,6 @@ HC_BOOT_LD_OPTS =                            \
  25  ifeq "$(GhcWithInterpreter)" "YES"
  26  HC_BOOT_LD_OPTS += \
  27     -L$(FPTOOLS_TOP_ABS)/libraries/template-haskell     \
  28 -   -L$(FPTOOLS_TOP_ABS)/libraries/readline     \
  29     -L$(FPTOOLS_TOP_ABS)/libraries/unix          \
  30     -L$(FPTOOLS_TOP_ABS)/libraries/unix/cbits
  31  endif
  32 @@ -135,14 +129,12 @@ HC_BOOT_LD_OPTS += \
  33     -u "$(UNDERSCORE)base_GHCziIOBase_NonTermination_closure" \
  34     -u "$(UNDERSCORE)base_GHCziIOBase_BlockedOnDeadMVar_closure" \
  35     -u "$(UNDERSCORE)base_GHCziIOBase_Deadlock_closure" \
  36 -   -u "$(UNDERSCORE)base_GHCziWeak_runFinalizzerBatch_closure" \
  37 -   -u "$(UNDERSCORE)__stginit_Prelude"
  38 -
  39 +   -u "$(UNDERSCORE)base_GHCziWeak_runFinalizzerBatch_closure"
  40
  41  HC_BOOT_LIBS =
  42
  43  ifeq "$(GhcWithInterpreter)" "YES"
  44 -HC_BOOT_LIBS += -lHSreadline -lreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits
  45 +HC_BOOT_LIBS += -lHStemplate-haskell -lHSunix -lHSunix_cbits
  46  endif
  47
  48  HC_BOOT_LIBS +=  -lHSCabal -lHShaskell98 -lHSregex-compat -lHSregex-posix -lHSregex-base -lHSbase -lHSbase_cbits -lHSparsec -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)