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

trunk/kBuild/tools/GXX64.kmk

@@ -37 +37 @@
 # Tool Specific Properties
 ifndef TOOL_GXX64_PREFIX
- TOOL_GXX64_PREFIX :=
+ TOOL_GXX64_PREFIX  :=
 endif
 ifndef TOOL_GXX64_SUFFIX
- TOOL_GXX64_SUFFIX := $(HOSTSUFF_EXE)
-endif
-TOOL_GXX64_CC  ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
-TOOL_GXX64_CXX ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
-TOOL_GXX64_PCH ?= $(TOOL_GXX64_CXX)
-TOOL_GXX64_AS  ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
+ TOOL_GXX64_SUFFIX  := $(HOSTSUFF_EXE)
+endif
 if1of ($(KBUILD_HOST), solaris)
- TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX)gar$(TOOL_GXX64_SUFFIX)
-else
- TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX)ar$(TOOL_GXX64_SUFFIX)
-endif
-TOOL_GXX64_LD  ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
-TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX)ld$(TOOL_GXX64_SUFFIX)
+ TOOL_GXX64_PREFIX2 ?= g
+else
+ TOOL_GXX64_PREFIX2 ?=
+endif
+TOOL_GXX64_SUFFIX2  ?= $(HOSTSUFF_EXE)
+TOOL_GXX64_PREFIX3  ?=
+TOOL_GXX64_SUFFIX3  ?= $(HOSTSUFF_EXE)
+TOOL_GXX64_CC       ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
+TOOL_GXX64_CXX      ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
+TOOL_GXX64_PCH      ?= $(TOOL_GXX64_CXX)
+TOOL_GXX64_AS       ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
+TOOL_GXX64_AR       ?= $(TOOL_GXX64_PREFIX2)ar$(TOOL_GXX64_SUFFIX2)
+TOOL_GXX64_LD       ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX3)ld$(TOOL_GXX64_SUFFIX3)
+else
+ TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX2)ld$(TOOL_GXX64_SUFFIX2)
+endif
 ifndef TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET)
  TOOL_GXX64_LDFLAGS.dll ?= -shared
@@ -70 +78 @@
  TOOL_GXX64_LD_SYSMOD_MAP ?=
 endif
-if1of ($(KBUILD_HOST), solaris)
- TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX)gobjcopy$(TOOL_GXX64_SUFFIX)
-else
- TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX)objcopy$(TOOL_GXX64_SUFFIX)
-endif
+TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX2)objcopy$(TOOL_GXX64_SUFFIX2)
 
 ifdef SLKRUNS