Commit c24af716 authored by Ian Lynagh's avatar Ian Lynagh

Don't include inter-package dependencies when compiling with stage 0; #4031

This fixes a problem when building with GHC 6.12 on Windows, where
dependencies on stage 0 (bootstrapping compiler) packages have absolute
paths c:/ghc/..., and make gets confused by the colon.
parent 7eb456b9
......@@ -391,7 +391,7 @@ rts_dist_MKDEPENDC_OPTS += -Irts/dist/build
endif
$(eval $(call build-dependencies,rts,dist))
$(eval $(call build-dependencies,rts,dist,1))
$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H)
......
......@@ -10,14 +10,20 @@
#
# -----------------------------------------------------------------------------
define build-dependencies # args: $1 = dir, $2 = distdir
define build-dependencies
# $1 = dir
# $2 = distdir
# $3 = GHC stage to use (0 == bootstrapping compiler)
$1_$2_depfile_haskell = $$($1_$2_depfile_base).haskell
$1_$2_depfile_c_asm = $$($1_$2_depfile_base).c_asm
$1_$2_C_FILES_DEPS = $$(filter-out $$($1_$2_C_FILES_NODEPS),$$($1_$2_C_FILES))
$1_$2_MKDEPENDHS_FLAGS = -include-pkg-deps -dep-makefile $$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way))
$1_$2_MKDEPENDHS_FLAGS = -dep-makefile $$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way))
ifneq "$3" "0"
$1_$2_MKDEPENDHS_FLAGS += -include-pkg-deps
endif
ifneq "$$($1_$2_NO_BUILD_DEPS)" "YES"
......
......@@ -133,7 +133,7 @@ $(call includes-sources,$1,$2)
$1_$2_WAYS_DASHED = $$(subst $$(space),,$$(patsubst %,-%,$$(strip $$($1_$2_WAYS))))
$1_$2_depfile_base = $1/$2/build/.depend$$($1_$2_WAYS_DASHED)
$(call build-dependencies,$1,$2)
$(call build-dependencies,$1,$2,$3)
# --- BUILDING
......
......@@ -92,7 +92,7 @@ $(call c-sources,$1,$2)
$1_$2_depfile_base = $1/$2/build/.depend
$(call build-dependencies,$1,$2)
$(call build-dependencies,$1,$2,$3)
# --- IMPLICIT RULES
......
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