Commit e6ca2d4a authored by chak@cse.unsw.edu.au.'s avatar chak@cse.unsw.edu.au.

Use CONF_CC_OPTS

- Needed to get arch-dependent options, eg, on Snow Leopard
parent f35b012e
......@@ -805,7 +805,8 @@ unifyCtxts :: [TcSigInfo] -> TcM [Inst]
-- Post-condition: the returned Insts are full zonked
unifyCtxts [] = panic "unifyCtxts []"
unifyCtxts (sig1 : sigs) -- Argument is always non-empty
= do { mapM_ unify_ctxt sigs
= do { traceTc $ text "unifyCtxts" <+> ppr (sig1 : sigs)
; mapM_ unify_ctxt sigs
; theta <- zonkTcThetaType (sig_theta sig1)
; newDictBndrs (sig_loc sig1) theta }
where
......
......@@ -122,8 +122,8 @@ $(libffi_STAMP_CONFIGURE):
export PATH; \
cd build && \
CC=$(WhatGccIsCalled) \
CFLAGS="$(SRC_CC_OPTS) -w" \
LDFLAGS="$(SRC_LD_OPTS) -w" \
CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS) -w" \
LDFLAGS="$(SRC_LD_OPTS) $(CONF_LD_OPTS) -w" \
"$(SHELL)" configure \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
......@@ -168,7 +168,7 @@ $(eval $(call all-target,libffi,libffi/libHSffi.a libffi/libHSffi_p.a))
libffi/HSffi.o: libffi/libHSffi.a
cd libffi && \
touch empty.c; \
"$(CC)" $(SRC_CC_OPTS) -c empty.c -o HSffi.o
"$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) -c empty.c -o HSffi.o
$(eval $(call all-target,libffi,libffi/HSffi.o))
......
......@@ -551,7 +551,7 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
CONF_CC_OPTS += -G0
endif
SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS) $(CONF_CC_OPTS)))
SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
#-----------------------------------------------------------------------------
......
......@@ -31,7 +31,7 @@ endif
# We filter out -Werror from SRC_CC_OPTS, because when configure tests
# for a feature it may not generate warning-free C code, and thus may
# think that the feature doesn't exist if -Werror is on.
$1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)"
$1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)"
$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)"
ifneq "$$(ICONV_INCLUDE_DIRS)" ""
......
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