ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-03-23 20:45:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nasa/trick

Browse Source
This commit is contained in:
Alex Lin 2019-06-14 07:44:44 -05:00
commit 03d93aee18
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/trick/makefiles/Makefile.common
View File

@ -4,6 +4,7 @@ MV := /bin/mv
RM := /bin/rm RM := /bin/rm
CP := /bin/cp CP := /bin/cp
MAKE_OUT := build/MAKE_out MAKE_OUT := build/MAKE_out
MAKE_ERR := build/MAKE_err
PWD = $(shell /bin/pwd) PWD = $(shell /bin/pwd)
COLOR = $(1) COLOR = $(1)
@ -19,7 +20,7 @@ endif
define ECHO_AND_LOG define ECHO_AND_LOG
$(call ECHO_TO_TERMINAL, $1) $(call ECHO_TO_TERMINAL, $1)
@echo $1 >> $(MAKE_OUT) @echo $1 >> $(MAKE_OUT)
@$1 2>&1 | $(TEE) -a $(MAKE_OUT) ; exit $${PIPESTATUS[0]} @$1 > >($(TEE) -a $(MAKE_OUT)) 2> >($(TEE) -a $(MAKE_ERR) >&2)
endef endef
export TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..) export TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)