summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2017-04-24 16:12:25 -0400
committerSteve Huston <shuston@riverace.com>2022-03-23 21:36:27 +0000
commitdbd88e70b186f80a3cd6d4bd84afa57b76d48e4d (patch)
tree0d7262001725ae0b2c28cf25b878b72d1e1122db
parenta1edea77d6486f10b70b965b99b387261aefd878 (diff)
downloadATCD-dbd88e70b186f80a3cd6d4bd84afa57b76d48e4d.tar.gz
Change recipe to use full pathname of source file for C/C++. Allows postprocessor scripts to keep track of where problems are in parallel builds.
-rw-r--r--ACE/include/makeinclude/rules.local.GNU26
1 files changed, 13 insertions, 13 deletions
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU
index c57f9c97f08..09b58f41627 100644
--- a/ACE/include/makeinclude/rules.local.GNU
+++ b/ACE/include/makeinclude/rules.local.GNU
@@ -115,34 +115,34 @@ nullstring :=
CC_OUTPUT_FLAG_SEP ?= $(nullstring) #space
%.$(PREPROCESS_SUFFIX): %.c
- $(PREPROCESS.c) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(PREPROCESS.c) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
%.$(PREPROCESS_SUFFIX): %.cpp
- $(PREPROCESS.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(PREPROCESS.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
$(VDIR)%.$(OBJEXT): %.c
$(mk_obj_out_dir)
- $(COMPILE.c) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.c) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
${MVCMD}
$(VDIR)%.$(OBJEXT): %.C
$(mk_obj_out_dir)
- $(COMPILE.c) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.c) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
${MVCMD}
$(VDIR)%.$(OBJEXT): %.cpp
$(mk_obj_out_dir)
- $(COMPILE.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
${MVCMD}
$(VDIR)%.$(OBJEXT): %.cc
$(mk_obj_out_dir)
- $(COMPILE.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
${MVCMD}
$(VDIR)%.$(OBJEXT): %.cxx
$(mk_obj_out_dir)
- $(COMPILE.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.cc) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
${MVCMD}
RC_OUTPUT_FLAG ?=
@@ -160,11 +160,11 @@ $(VDIR)%.rc.o: %.rc
ifndef SOLINK
$(VSHDIR)%.$(OBJEXT): %.c
$(mk_obj_out_dir)
- $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
$(VSHDIR)%.$(OBJEXT): %.C
$(mk_obj_out_dir)
- $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
# I added the "Executable Shared Object (ESO)" define to separate between
# normal shared object files and executable shared object files (the kind
@@ -182,20 +182,20 @@ $(VSHDIR)%.$(SOEXT): %.cpp
$(VSHDIR)%.$(OBJEXT): %.cc
$(mk_obj_out_dir)
- $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
$(VSHDIR)%.$(OBJEXT): %.cpp
$(mk_obj_out_dir)
- $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
$(VSHDIR)%.$(OBJEXT): %.cxx
$(mk_obj_out_dir)
- $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $<
+ $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $(abspath $<)
ifneq (,$(COMPILE.rc))
$(VSHDIR)%.rc.$(OBJEXT): %.rc
$(mk_obj_out_dir)
- $(COMPILE.rc) $(RC_OUTPUT_FLAG) $@ $<
+ $(COMPILE.rc) $(RC_OUTPUT_FLAG) $@ $(abspath $<)
endif # COMPILE.rc
$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT)