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

trunk/kBuild/tools/GCC32.kmk

@@ -36 +36 @@
 
 # Tool Specific Properties
-TOOL_GCC32_CC  ?= gcc$(HOSTSUFF_EXE) -m32
-TOOL_GCC32_CXX ?= g++$(HOSTSUFF_EXE) -m32
-TOOL_GCC32_AS  ?= gcc$(HOSTSUFF_EXE) -m32
-TOOL_GCC32_AR  ?= ar$(HOSTSUFF_EXE)
-TOOL_GCC32_LD  ?= gcc$(HOSTSUFF_EXE) -m32
-TOOL_GCC32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
+ifndef TOOL_GCC32_PREFIX
+ TOOL_GCC32_PREFIX :=
+endif
+ifndef TOOL_GCC32_SUFFIX
+ TOOL_GCC32_SUFFIX := $(HOSTSUFF_EXE)
+endif
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GCC32_PREFIX2  ?= g
+else
+ TOOL_GCC32_PREFIX2  ?=
+endif
+TOOL_GCC32_SUFFIX2   ?= $(HOSTSUFF_EXE)
+TOOL_GCC32_PREFIX3   ?=
+TOOL_GCC32_SUFFIX3   ?= $(HOSTSUFF_EXE)
+
+TOOL_GCC32_CC        ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32
+TOOL_GCC32_CXX       ?= $(TOOL_GCC32_PREFIX)g++$(TOOL_GCC32_SUFFIX) -m32
+TOOL_GCC32_AS        ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32
+TOOL_GCC32_AR        ?= $(TOOL_GCC32_PREFIX2)ar$(TOOL_GCC32_SUFFIX2)
+TOOL_GCC32_LD        ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GCC32_LD_SYSMOD ?= $(TOOL_GCC32_PREFIX3)ld$(TOOL_GCC32_SUFFIX3)
+else
+ TOOL_GCC32_LD_SYSMOD ?= $(TOOL_GCC32_PREFIX2)ld$(TOOL_GCC32_SUFFIX2)
+endif
 ifndef TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET)
 TOOL_GCC32_LDFLAGS.dll ?= -shared
@@ -59 +78 @@
 TOOL_GCC32_LD_SYSMOD_MAP ?=
 endif
-if1of ($(KBUILD_HOST), solaris)
- TOOL_GCC32_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
-else
- TOOL_GCC32_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
-endif
+TOOL_GCC32_OBJCOPY ?= $(TOOL_GCC32_PREFIX2)objcopy$(TOOL_GCC32_SUFFIX2)
 
 ifdef SLKRUNS