Changeset 3391 for trunk/kBuild/tools/GXX3OMF.kmk

Timestamp:

Jun 30, 2020, 10:08:15 AM (5 years ago)

Author:

bird

Message:

tools/GXX*: Added _PREFIX/_SUFFIX properties to all g++ tools. Some minor fixes.

File:

• trunk/kBuild/tools/GXX3OMF.kmk (modified) (1 diff)

trunk/kBuild/tools/GXX3OMF.kmk

@@ -35 +35 @@
 
 # Tool Specific Properties
-TOOL_GXX3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GXX3OMF_CXX ?= g++$(HOSTSUFF_EXE)
-TOOL_GXX3OMF_PCH ?= $(TOOL_GXX3OMF_CXX)
-TOOL_GXX3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GXX3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
-TOOL_GXX3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
-TOOL_GXX3OMF_LD ?= g++$(HOSTSUFF_EXE)
-TOOL_GXX3OMF_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
+ifndef TOOL_GXX3OMF_PREFIX
+ TOOL_GXX3OMF_PREFIX :=
+endif
+ifndef TOOL_GXX3OMF_SUFFIX
+ TOOL_GXX3OMF_SUFFIX := $(HOSTSUFF_EXE)
+endif
+TOOL_GXX3OMF_CC        ?= $(TOOL_GXX3OMF_PREFIX)gcc$(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_CXX       ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_PCH       ?= $(TOOL_GXX3OMF_CXX)
+TOOL_GXX3OMF_AS        ?= $(TOOL_GXX3OMF_PREFIX)gcc$(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_AR        ?= $(TOOL_GXX3OMF_PREFIX)emxomfar$(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_AR_IMP    ?= $(TOOL_GXX3OMF_PREFIX)emximp$(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_LD        ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_LD_SYSMOD ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
 ifndef TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET)
-TOOL_GXX3OMF_LDFLAGS.dll ?= -shared -Zdll
+ TOOL_GXX3OMF_LDFLAGS.dll   ?= -shared -Zdll
 else
-TOOL_GXX3OMF_LDFLAGS.dll ?= $(TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET))
+ TOOL_GXX3OMF_LDFLAGS.dll   ?= $(TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET))
 endif
 TOOL_GXX3OMF_LDFLAGS.sysmod ?= -nostdlib
-TOOL_GXX3OMF_LD_MAP ?= -Zmap=$(1)
-TOOL_GXX3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
-TOOL_GXX3OMF_RC = rc$(HOSTSUFF_EXE)
+TOOL_GXX3OMF_LD_MAP         ?= -Zmap=$(1)
+TOOL_GXX3OMF_LD_SYSMOD_MAP  ?= -Zmap=$(1)
+
+TOOL_GXX3OMF_RC_PREFIX ?= $(TOOL_GXX3OMF_PREFIX)
+TOOL_GXX3OMF_RC_SUFFIX ?= $(TOOL_GXX3OMF_SUFFIX)
+TOOL_GXX3OMF_RC = $(TOOL_GXX3OMF_RC_PREFIX)rc$(TOOL_GXX3OMF_RC_SUFFIX)
 
 ifdef SLKRUNS
-TOOL_GXX3OMF_CC  += -fmessage-length=0
-TOOL_GXX3OMF_CXX += -fmessage-length=0
+ TOOL_GXX3OMF_CC  += -fmessage-length=0
+ TOOL_GXX3OMF_CXX += -fmessage-length=0
 endif