Changeset 3391 for trunk/kBuild/tools/GXX3.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/GXX3.kmk (modified) (2 diffs)

trunk/kBuild/tools/GXX3.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Generic GCC v3.2.x using the system GCC and Binutils, for building C++ code.
+# kBuild Tool Config - Generic GCC v3.2+ using the system GCC and Binutils, for building C++ code.
 #
 
@@ -35 +35 @@
 
 # Tool Specific Properties
-TOOL_GXX3_CC  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GXX3_CXX ?= g++$(HOSTSUFF_EXE)
+ifndef TOOL_GXX3_PREFIX
+ TOOL_GXX3_PREFIX :=
+endif
+ifndef TOOL_GXX3_SUFFIX
+ TOOL_GXX3_SUFFIX := $(HOSTSUFF_EXE)
+endif
+TOOL_GXX3_CC  ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
+TOOL_GXX3_CXX ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
 TOOL_GXX3_PCH ?= $(TOOL_GXX3_CXX)
-TOOL_GXX3_AS  ?= gcc$(HOSTSUFF_EXE)
-ifeq ($(KBUILD_TARGET),solaris)
- TOOL_GXX3_AR ?= gar$(HOSTSUFF_EXE)
-else
- TOOL_GXX3_AR ?= ar$(HOSTSUFF_EXE)
+TOOL_GXX3_AS  ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
+if1of ($(KBUILD_TARGET),solaris)
+ TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX)gar$(TOOL_GXX3_SUFFIX)
+else
+ TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX)ar$(TOOL_GXX3_SUFFIX)
 endif
 ifeq ($(KBUILD_TARGET),os2)
- TOOL_GXX3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
-else
- TOOL_GXX3_AR_IMP ?= $(ECHO) not supported!
-endif
-TOOL_GXX3_LD ?= g++$(HOSTSUFF_EXE)
-TOOL_GXX3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
+ TOOL_GXX3_AR_IMP   ?= $(TOOL_GXX3_PREFIX)emximp$(TOOL_GXX3_SUFFIX)
+else
+ TOOL_GXX3_AR_IMP   ?= $(ECHO) not supported!
+endif
+TOOL_GXX3_LD        ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
+TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX)ld$(TOOL_GXX3_SUFFIX)
 ifndef TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET)
- TOOL_GXX3_LDFLAGS.dll ?= -shared
-else
- TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET))
+ TOOL_GXX3_LDFLAGS.dll   ?= -shared
+else
+ TOOL_GXX3_LDFLAGS.dll   ?= $(TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET))
 endif
 TOOL_GXX3_LDFLAGS.sysmod ?= -r
-TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
+TOOL_GXX3_LD_SONAME      ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
 ifeq ($(KBUILD_TARGET),os2)
- TOOL_GXX3_LD_MAP ?= -Zmap=$(1)
+ TOOL_GXX3_LD_MAP        ?= -Zmap=$(1)
  TOOL_GXX3_LD_SYSMOD_MAP ?= -Zmap=$(1)
 else
- TOOL_GXX3_LD_MAP ?=
+ TOOL_GXX3_LD_MAP        ?=
  TOOL_GXX3_LD_SYSMOD_MAP ?=
 endif
 if1of ($(KBUILD_HOST), solaris)
- TOOL_GXX3_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
-else
- TOOL_GXX3_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
+ TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)gobjcopy$(TOOL_GXX3_SUFFIX)
+else
+ TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)objcopy$(TOOL_GXX3_SUFFIX)
 endif