projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-23 15:12:55 by simonmar]
[ghc-hetmet.git]
/
mk
/
suffix.mk
diff --git
a/mk/suffix.mk
b/mk/suffix.mk
index
02469fe
..
69d164e
100644
(file)
--- a/
mk/suffix.mk
+++ b/
mk/suffix.mk
@@
-135,7
+135,7
@@
endif
.PRECIOUS: %.gc
%.hs %_stub_ffi.c %_stub_ffi.h : %.gc
.PRECIOUS: %.gc
%.hs %_stub_ffi.c %_stub_ffi.h : %.gc
- $(GREENCARD) $(GC_OPTS) $< -o $@
+ $(GREENCARD) $(GC_OPTS) $<
%.lhs : %.gc
$(GREENCARD) $(GC_OPTS) $< -o $@
%.lhs : %.gc
$(GREENCARD) $(GC_OPTS) $< -o $@
@@
-146,13
+146,14
@@
endif
#-----------------------------------------------------------------------------
# C-related suffix rules
#-----------------------------------------------------------------------------
# C-related suffix rules
-ifeq "$(UseGhcForCc)" "YES"
+# UseGhcForCc is only relevant when not booting from HC files.
+ifeq "$(UseGhcForCc) $(BootingFromHc)" "YES NO"
-$(odir_)%.$(way_)o : %.$(way_)s
+$(odir_)%.$(way_)o : %.c
@$(RM) $@
$(HC) $(GHC_CC_OPTS) -c $< -o $@
@$(RM) $@
$(HC) $(GHC_CC_OPTS) -c $< -o $@
-$(odir_)%.$(way_)o : %.c
+$(odir_)%.$(way_)o : %.$(way_)s
@$(RM) $@
$(HC) $(GHC_CC_OPTS) -c $< -o $@
@$(RM) $@
$(HC) $(GHC_CC_OPTS) -c $< -o $@
@@
-166,14
+167,14
@@
$(odir_)%.$(way_)s : %.c
else
else
-$(odir_)%.$(way_)o : %.$(way_)s
- @$(RM) $@
- $(AS) $(AS_OPTS) -o $@ $<
-
$(odir_)%.$(way_)o : %.c
@$(RM) $@
$(CC) $(CC_OPTS) -c $< -o $@
$(odir_)%.$(way_)o : %.c
@$(RM) $@
$(CC) $(CC_OPTS) -c $< -o $@
+$(odir_)%.$(way_)o : %.$(way_)s
+ @$(RM) $@
+ $(AS) $(AS_OPTS) -o $@ $<
+
$(odir_)%.$(way_)o : %.S
@$(RM) $@
$(CC) $(CC_OPTS) -c $< -o $@
$(odir_)%.$(way_)o : %.S
@$(RM) $@
$(CC) $(CC_OPTS) -c $< -o $@
@@
-307,4
+308,4
@@
endif
% : %.pp
@$(RM) $@
% : %.pp
@$(RM) $@
- $(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@
+ $(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@