Changeset 3393 for trunk/kBuild/tools/GXX3.kmk

Timestamp:

Jun 30, 2020, 7:11:42 PM (5 years ago)

Author:

bird

Message:

tools/*GCC|GXX*: More prefix/suffix stuff. Separate for gcc/g++, binutils and other stuff.

File:

• trunk/kBuild/tools/GXX3.kmk (modified) (2 diffs)

trunk/kBuild/tools/GXX3.kmk

@@ -36 +36 @@
 # Tool Specific Properties
 ifndef TOOL_GXX3_PREFIX
- 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  ?= $(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
+ TOOL_GXX3_SUFFIX   := $(HOSTSUFF_EXE)
+endif
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GXX3_PREFIX2  ?= g
+else
+ TOOL_GXX3_PREFIX2  ?=
+endif
+TOOL_GXX3_SUFFIX2   ?= $(HOSTSUFF_EXE)
+TOOL_GXX3_PREFIX3   ?=
+TOOL_GXX3_SUFFIX3   ?= $(HOSTSUFF_EXE)
+
+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        ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
+TOOL_GXX3_AR        ?= $(TOOL_GXX3_PREFIX2)ar$(TOOL_GXX3_SUFFIX2)
 ifeq ($(KBUILD_TARGET),os2)
- TOOL_GXX3_AR_IMP   ?= $(TOOL_GXX3_PREFIX)emximp$(TOOL_GXX3_SUFFIX)
+ TOOL_GXX3_AR_IMP   ?= $(TOOL_GXX3_PREFIX3)emximp$(TOOL_GXX3_SUFFIX3)
 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)
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX3)ld$(TOOL_GXX3_SUFFIX3)
+else
+ TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX2)ld$(TOOL_GXX3_SUFFIX2)
+endif
 ifndef TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET)
  TOOL_GXX3_LDFLAGS.dll   ?= -shared
@@ -71 +80 @@
  TOOL_GXX3_LD_SYSMOD_MAP ?=
 endif
-if1of ($(KBUILD_HOST), solaris)
- TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)gobjcopy$(TOOL_GXX3_SUFFIX)
-else
- TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)objcopy$(TOOL_GXX3_SUFFIX)
-endif
+TOOL_GXX3_OBJCOPY ?= $(TOOL_GXX3_PREFIX)objcopy$(TOOL_GXX3_SUFFIX)
 
 ifdef SLKRUNS