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

trunk/kBuild/tools/GXX32.kmk

@@ -37 +37 @@
 # Tool Specific Properties
 ifndef TOOL_GXX32_PREFIX
- TOOL_GXX32_PREFIX :=
+ TOOL_GXX32_PREFIX  :=
 endif
 ifndef TOOL_GXX32_SUFFIX
- TOOL_GXX32_SUFFIX := $(HOSTSUFF_EXE)
-endif
-TOOL_GXX32_CC  ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
-TOOL_GXX32_CXX ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
-TOOL_GXX32_PCH ?= $(TOOL_GXX32_CXX)
-TOOL_GXX32_AS  ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
-if1of ($(KBUILD_TARGET),solaris)
- TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX)gar$(TOOL_GXX32_SUFFIX)
-else
- TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX)ar$(TOOL_GXX32_SUFFIX)
-endif
-TOOL_GXX32_LD  ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
-TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX)ld$(TOOL_GXX32_SUFFIX)
+ TOOL_GXX32_SUFFIX  := $(HOSTSUFF_EXE)
+endif
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GXX32_PREFIX2 ?= g
+else
+ TOOL_GXX32_PREFIX2 ?=
+endif
+TOOL_GXX32_SUFFIX2  ?= $(HOSTSUFF_EXE)
+TOOL_GXX32_PREFIX3  ?=
+TOOL_GXX32_SUFFIX3  ?= $(HOSTSUFF_EXE)
+TOOL_GXX32_CC       ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
+TOOL_GXX32_CXX      ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
+TOOL_GXX32_PCH      ?= $(TOOL_GXX32_CXX)
+TOOL_GXX32_AS       ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
+TOOL_GXX32_AR       ?= $(TOOL_GXX32_PREFIX2)ar$(TOOL_GXX32_SUFFIX2)
+TOOL_GXX32_LD       ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX3)ld$(TOOL_GXX32_SUFFIX3)
+else
+ TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX2)ld$(TOOL_GXX32_SUFFIX2)
+endif
 ifndef TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET)
  TOOL_GXX32_LDFLAGS.dll ?= -shared
@@ -70 +78 @@
  TOOL_GXX32_LD_SYSMOD_MAP ?=
 endif
-if1of ($(KBUILD_HOST), solaris)
- TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX)gobjcopy$(TOOL_GXX32_SUFFIX)
-else
- TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX)objcopy$(TOOL_GXX32_SUFFIX)
-endif
+TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX2)objcopy$(TOOL_GXX32_SUFFIX)
 
 ifdef SLKRUNS