summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngela Stegmaier <angelabaker@ti.com>2017-05-22 16:04:29 -0500
committerAngela Stegmaier <angelabaker@ti.com>2017-05-23 15:40:07 -0500
commit9fe74361064a4d45be5d31f06c8f7e57254d1a57 (patch)
tree4f387eb3ce67015e5b5964fd5fa4c15f6ece4848
parent997ef62671476be051cd4f9f94907e61573dffae (diff)
downloadipc-9fe74361064a4d45be5d31f06c8f7e57254d1a57.tar.gz
QNX: Build: Fix Build for Newer QNX Versions on Windows
When building on Windows, the overriding of the usemsg command in quiet.mk was causing the build to fail. It appears that usemsg isn't always defined when building with newer QNX versions and the overriding of the command should be done conditionally. This patch changes quiet.mk to only update the usemsg command if it is defined. Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
-rw-r--r--qnx/quiet.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/qnx/quiet.mk b/qnx/quiet.mk
index d279730..f40d474 100644
--- a/qnx/quiet.mk
+++ b/qnx/quiet.mk
@@ -40,7 +40,9 @@ CCPREF := @$(CCPREF)
ASPREF := @$(ASPREF)
LDPREF := @$(LDPREF)
ARPREF := @$(ARPREF) 2>/dev/null
+ifneq ($(UMPREF),)
UMPREF := @$(UMPREF)
+endif
MKASMOFF_HOST := @$(MKASMOFF_HOST)
else
QUIET_ROOT := $(PROJECT_ROOT)
@@ -52,8 +54,10 @@ LDPREF_CMD := $(LDPREF)
LDPREF = @echo "Linking " $(@:$(QUIET_ROOT)/%=%) && $(LDPREF_CMD)
ARPREF_CMD := $(ARPREF) 2>/dev/null
ARPREF = @echo "Archiving " $(@:$(QUIET_ROOT)/%=%) && $(ARPREF_CMD)
+ifneq ($(UMPREF),)
UMPREF_CMD := $(UMPREF)
UMPREF = @echo "Usemsg " $(@:$(QUIET_ROOT)/%=%) && $(UMPREF_CMD)
+endif
MKASMOFF_CMD := $(MKASMOFF_HOST)
MKASMOFF_HOST = @echo "Generating" $(CURDIR:$(QUIET_ROOT)/%=%)/$@ && \
$(MKASMOFF_CMD)