diff options
Diffstat (limited to 'rts/ghc.mk')
| -rw-r--r-- | rts/ghc.mk | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 9cd66920c7..26865b5bb7 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -190,8 +190,12 @@ ifeq "$(NEED_DTRACE_PROBES_OBJ)" "YES" rts_$1_DTRACE_OBJS = rts/dist/build/RtsProbes.$$($1_osuf) $$(rts_$1_DTRACE_OBJS) : $$(rts_$1_OBJS) - $(DTRACE) -G -C $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) -DDTRACE -s rts/RtsProbes.d -o \ - $$@ $$(rts_$1_OBJS) + $(DTRACE) -G -C \ + $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) \ + -I$$(BUILD_1_INCLUDE_DIR) \ + -DDTRACE -s rts/RtsProbes.d \ + -o $$@ \ + $$(rts_$1_OBJS) endif endif @@ -352,7 +356,12 @@ endif # support for registerised builds on this arch. -- BL 2010/02/03 # WARNING_OPTS += -Wcast-align -STANDARD_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS)) -Irts -Irts/dist/build +STANDARD_OPTS += \ + $(addprefix -I,$(GHC_INCLUDE_DIRS)) \ + -I$(BUILD_1_INCLUDE_DIR) \ + -Irts \ + -Irts/dist/build + # COMPILING_RTS is only used when building Win32 DLL support. STANDARD_OPTS += -DCOMPILING_RTS -DFS_NAMESPACE=rts @@ -568,6 +577,10 @@ endif $(eval $(call dependencies,rts,dist,1)) +$(rts_dist_depfile_c_asm) : $(includes_dist_H_CONFIG) +$(rts_dist_depfile_c_asm) : $(includes_dist_H_PLATFORM) +$(rts_dist_depfile_c_asm) : $(includes_dist_H_VERSION) + $(rts_dist_depfile_c_asm) : $(DTRACEPROBES_H) ifneq "$(UseSystemLibFFI)" "YES" $(rts_dist_depfile_c_asm) : $(libffi_HEADERS) @@ -594,7 +607,7 @@ DTRACE_FLAGS = -x cpppath=$(CC) endif DTRACEPROBES_SRC = rts/RtsProbes.d -$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $$(dir $$@)/. +$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) $(includes_1_H_PLATFORM) | $$(dir $$@)/. "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C $(DTRACE_FLAGS) -h -o $@ -s $< endif @@ -610,9 +623,9 @@ ifeq "$(HaveLibMingwEx)" "YES" rts_PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX endif -$(eval $(call manual-package-config,rts)) +$(eval $(call manual-package-config,rts,1)) -rts/package.conf.inplace : $(includes_H_CONFIG) $(includes_H_PLATFORM) +rts/dist/package.conf.inplace : $(includes_1_H_CONFIG) $(includes_1_H_PLATFORM) $(includes_1_H_VERSION) # ----------------------------------------------------------------------------- # installing |