From 186e623a2508fde618bec1202c4c375d2986fec5 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Thu, 7 Jul 2016 15:14:39 -0500 Subject: [PATCH] Need preCP hook for S_overrides.mk to support actions early in build, without Makefile_sim consequences Undoing previous commit. refs #136 --- makefiles/Makefile.sim | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/makefiles/Makefile.sim b/makefiles/Makefile.sim index 944df6c8..c1038135 100644 --- a/makefiles/Makefile.sim +++ b/makefiles/Makefile.sim @@ -12,13 +12,13 @@ ifeq ($(MAKECMDGOALS), debug) TRICK_CPFLAGS += --debug endif -all : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a preMakefile_simHook Makefile_sim +all : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a Makefile_sim @/bin/cp ${TRICK_HOME}/bin/MAKE_out_header.txt MAKE_out @$(MAKE) --no-print-directory -f Makefile_sim ICG 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim convert_swig 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim all 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} -test : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a preMakefile_simHook Makefile_sim +test : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a Makefile_sim @/bin/cp ${TRICK_HOME}/bin/MAKE_out_header.txt MAKE_out @$(MAKE) --no-print-directory -f Makefile_sim ICG 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @$(MAKE) --no-print-directory -f Makefile_sim convert_swig 2>&1 | tee -a MAKE_out ; exit $${PIPESTATUS[0]} @@ -26,8 +26,6 @@ test : ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a preMakefile_simHook Makefi debug : all -preMakefile_simHook: - ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick.a: @echo "Cannot find $@. Please build Trick for this platfrom" @exit -1