projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add EVENT_CREATE_SPARK_THREAD to replace EVENT_SPARK_TO_THREAD
[ghc-hetmet.git]
/
mk
/
cabal-flags.mk
diff --git
a/mk/cabal-flags.mk
b/mk/cabal-flags.mk
index
e1ef084
..
253a1e3
100644
(file)
--- a/
mk/cabal-flags.mk
+++ b/
mk/cabal-flags.mk
@@
-29,20
+29,20
@@
COMMON_CONFIGURE_FLAGS = \
--with-ld=$(LD) \
$(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
--with-ld=$(LD) \
$(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
-ifneq "$(HSCOLOUR)" ""
-COMMON_CONFIGURE_FLAGS += --with-hscolour=$(HSCOLOUR)
+ifeq "$(HSCOLOUR_SRCS)" "YES"
+CONFIGURE_OPTS += --with-hscolour="$(HSCOLOUR)"
endif
ifneq "$(ALEX)" ""
endif
ifneq "$(ALEX)" ""
-COMMON_CONFIGURE_FLAGS += --with-alex=$(ALEX)
+COMMON_CONFIGURE_FLAGS += --with-alex="$(ALEX)"
endif
ifneq "$(HAPPY)" ""
endif
ifneq "$(HAPPY)" ""
-COMMON_CONFIGURE_FLAGS += --with-happy=$(HAPPY)
+COMMON_CONFIGURE_FLAGS += --with-happy="$(HAPPY)"
endif
COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
endif
COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
- --configure-option=--with-cc=$(CC)
+ --configure-option=--with-cc="$(CC)"
COMMON_CONFIGURE_FLAGS += $(shell [ -f $(HSC2HS_INPLACE) ] && \
echo --with-hsc2hs=$(HSC2HS_INPLACE) )
COMMON_CONFIGURE_FLAGS += $(shell [ -f $(HSC2HS_INPLACE) ] && \
echo --with-hsc2hs=$(HSC2HS_INPLACE) )
@@
-89,8
+89,7
@@
USE_STAGE1_CONFIGURE_FLAGS = \
USE_STAGE2_CONFIGURE_FLAGS = \
--with-compiler=$(GHC_STAGE2) \
USE_STAGE2_CONFIGURE_FLAGS = \
--with-compiler=$(GHC_STAGE2) \
- $(USE_STAGE_CONFIGURE_FLAGS) \
- --package-db $(STAGE3_PACKAGE_CONF)
+ $(USE_STAGE_CONFIGURE_FLAGS)
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))