projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #4829 (build does not respect --with-gcc option)
[ghc-hetmet.git]
/
rts
/
ghc.mk
diff --git
a/rts/ghc.mk
b/rts/ghc.mk
index
0c224e9
..
8825219
100644
(file)
--- a/
rts/ghc.mk
+++ b/
rts/ghc.mk
@@
-460,9
+460,14
@@
ifeq "$(HaveDtrace)" "YES"
rts_CC_OPTS += -DDTRACE
rts_HC_OPTS += -DDTRACE
rts_CC_OPTS += -DDTRACE
rts_HC_OPTS += -DDTRACE
+# Apple's dtrace (the only one supported by ghc at the moment) uses
+# gcc as its preprocessor. If gcc isn't at /usr/bin/gcc, or we need
+# to force it to use a different gcc, we need to give the path in
+# the option cpppath.
+
DTRACEPROBES_SRC = rts/RtsProbes.d
$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $(dir $@)/.
DTRACEPROBES_SRC = rts/RtsProbes.d
$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $(dir $@)/.
- "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -h -o $@ -s $<
+ "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -x cpppath=$(WhatGccIsCalled) -h -o $@ -s $<
endif
endif