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

trunk/kBuild/tools/GCC3.kmk

@@ -35 +35 @@
 
 # Tool Specific Properties
-TOOL_GCC3_CC  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC3_CXX ?= g++$(HOSTSUFF_EXE)
-TOOL_GCC3_AS  ?= gcc$(HOSTSUFF_EXE)
-ifeq ($(KBUILD_TARGET),solaris) ## @todo drop the MRI script!
- TOOL_GCC3_AR ?= gar$(HOSTSUFF_EXE)
-else
- TOOL_GCC3_AR ?= ar$(HOSTSUFF_EXE)
-endif
+ifndef TOOL_GCC3_PREFIX
+ TOOL_GCC3_PREFIX :=
+endif
+ifndef TOOL_GCC3_SUFFIX
+ TOOL_GCC3_SUFFIX := $(HOSTSUFF_EXE)
+endif
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GCC3_PREFIX2  ?= g
+else
+ TOOL_GCC3_PREFIX2  ?=
+endif
+TOOL_GCC3_SUFFIX2   ?= $(HOSTSUFF_EXE)
+TOOL_GCC3_PREFIX3   ?=
+TOOL_GCC3_SUFFIX3   ?= $(HOSTSUFF_EXE)
+TOOL_GCC3_CC        ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX)
+TOOL_GCC3_CXX       ?= $(TOOL_GCC3_PREFIX)g++$(TOOL_GCC3_SUFFIX)
+TOOL_GCC3_AS        ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX)
+TOOL_GCC3_AR        ?= $(TOOL_GCC3_PREFIX2)ar$(TOOL_GCC3_SUFFIX2)
 ifeq ($(KBUILD_TARGET),os2)
- TOOL_GCC3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
-else
- TOOL_GCC3_AR_IMP ?= $(ECHO) not supported!
-endif
-TOOL_GCC3_LD ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
+ TOOL_GCC3_AR_IMP   ?= $(TOOL_GCC3_PREFIX3)emximp$(TOOL_GCC3_SUFFIX3)
+else
+ TOOL_GCC3_AR_IMP   ?= $(ECHO) not supported!
+endif
+TOOL_GCC3_LD        ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX)
+if1of ($(KBUILD_HOST), solaris)
+TOOL_GCC3_LD_SYSMOD ?= $(TOOL_GCC3_PREFIX3)ld$(TOOL_GCC3_SUFFIX3)
+else
+TOOL_GCC3_LD_SYSMOD ?= $(TOOL_GCC3_PREFIX2)ld$(TOOL_GCC3_SUFFIX2)
+endif
 ifndef TOOL_GCC3_LDFLAGS.$(KBUILD_TARGET)
  TOOL_GCC3_LDFLAGS.dll ?= -shared
@@ -64 +78 @@
  TOOL_GCC3_LD_SYSMOD_MAP ?=
 endif
-if1of ($(KBUILD_HOST), solaris)
- TOOL_GCC3_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
-else
- TOOL_GCC3_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
-endif
+TOOL_GCC3_OBJCOPY ?= $(TOOL_GCC3_PREFIX2)objcopy$(TOOL_GCC3_SUFFIX2)
 
 ifdef SLKRUNS