ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-30 16:13:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use existing variables for LD and c++

Browse Source 
This is why we have code reviews!
This commit is contained in:
Derek Bankieris 2019-03-25 11:33:50 -05:00
parent 4146834f10
commit 951bee52c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/trick/makefiles/trickify.mk
View File

@ -114,10 +114,10 @@ TRICK_EXT_LIB_DIRS :=
$(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME))
$(info $(call COLOR,Linking) $@)
ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
@echo ld -r -o $@ $^ >> $(MAKE_OUT)
@echo $(LD) $(LD_PARTIAL) -o $@ $^ >> $(MAKE_OUT)
$(ECHO_CMD)ld -r -o $@ $^ 2>&1 | $(TEE) -a $(MAKE_OUT); exit $${PIPESTATUS[0]}
else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
@echo c++ -shared -o $@ $^ >> $(MAKE_OUT)
@echo $(TRICK_CPPC) -shared -o $@ $^ >> $(MAKE_OUT)
$(ECHO_CMD)c++ -shared -o $@ $^ 2>&1 | $(TEE) -a $(MAKE_OUT); exit $${PIPESTATUS[0]}
else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
@echo ar rcs $@ $^ >> $(MAKE_OUT)