Commit fdc0cd3d authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Bootstrapping fixes

parent bb60c721
...@@ -856,6 +856,10 @@ publish-sdist : ...@@ -856,6 +856,10 @@ publish-sdist :
$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
endif endif
ifeq "$(GhcUnregisterised)" "YES"
SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Cleaning # Cleaning
......
...@@ -54,11 +54,11 @@ endif ...@@ -54,11 +54,11 @@ endif
# XXX: for some reason these get used in preference to the direct # XXX: for some reason these get used in preference to the direct
# .hs->.o rule, I don't know why --SDM # .hs->.o rule, I don't know why --SDM
$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h
$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -x c -c $$< -o $$@ $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
$1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h
$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -x c -c $$< -o $$@ $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
# $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc
# $$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ # $$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
......
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