Commit f5106d93 authored by simonpj's avatar simonpj
Browse files

[project @ 2005-01-31 14:53:13 by simonpj]

Compile utilities and lib/compat with GhcHcOpts, in case it is profiled
parent c269f662
...@@ -17,6 +17,10 @@ MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) ...@@ -17,6 +17,10 @@ MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
UseGhcForCc = YES UseGhcForCc = YES
# This library is linked to the compiler, at least in stage1, so we
# better make sure it is built the same "way":
SRC_HC_OPTS += $(GhcHcOpts)
ifeq "$(ghc_ge_603)" "YES" ifeq "$(ghc_ge_603)" "YES"
# These modules are all provided in GHC 6.3+ # These modules are all provided in GHC 6.3+
EXCLUDED_SRCS += \ EXCLUDED_SRCS += \
......
...@@ -17,6 +17,11 @@ SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat ...@@ -17,6 +17,11 @@ SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR)
HC_BOOT_LIBS += -lghccompat HC_BOOT_LIBS += -lghccompat
# This is required because libghccompat.a must be built with
# $(GhcHcOpts) because it is linked to the compiler, and hence
# we must also build with $(GhcHcOpts) here:
SRC_HC_OPTS += $(GhcHcOpts)
ifeq "$(Windows)" "YES" ifeq "$(Windows)" "YES"
# not very nice, but required for -lghccompat on Windows # not very nice, but required for -lghccompat on Windows
SRC_LD_OPTS += -lshell32 SRC_LD_OPTS += -lshell32
......
...@@ -13,6 +13,11 @@ INSTALLING=1 ...@@ -13,6 +13,11 @@ INSTALLING=1
SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
# This is required because libghccompat.a must be built with
# $(GhcHcOpts) because it is linked to the compiler, and hence
# we must also build with $(GhcHcOpts) here:
SRC_HC_OPTS += $(GhcHcOpts)
HS_PROG = hsc2hs-bin HS_PROG = hsc2hs-bin
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
HS_PROG = hsc2hs$(exeext) HS_PROG = hsc2hs$(exeext)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment