Changeset 3393 for trunk/kBuild/tools/GCC64.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/GCC64.kmk (modified) (1 diff)

trunk/kBuild/tools/GCC64.kmk

@@ -36 +36 @@
 
 # Tool Specific Properties
-TOOL_GCC64_CC  ?= gcc$(HOSTSUFF_EXE) -m64
-TOOL_GCC64_CXX ?= g++$(HOSTSUFF_EXE) -m64
-TOOL_GCC64_AS  ?= gcc$(HOSTSUFF_EXE) -m64
-TOOL_GCC64_AR  ?= ar$(HOSTSUFF_EXE)
-TOOL_GCC64_LD  ?= gcc$(HOSTSUFF_EXE) -m64
-TOOL_GCC64_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
+ifndef TOOL_GCC64_PREFIX
+ TOOL_GCC64_PREFIX :=
+endif
+ifndef TOOL_GCC64_SUFFIX
+ TOOL_GCC64_SUFFIX := $(HOSTSUFF_EXE)
+endif
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GCC64_PREFIX2  ?= g
+else
+ TOOL_GCC64_PREFIX2  ?=
+endif
+TOOL_GCC64_SUFFIX2   ?= $(HOSTSUFF_EXE)
+TOOL_GCC64_PREFIX3   ?=
+TOOL_GCC64_SUFFIX3   ?= $(HOSTSUFF_EXE)
+TOOL_GCC64_CC        ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64
+TOOL_GCC64_CXX       ?= $(TOOL_GCC64_PREFIX)g++$(TOOL_GCC64_SUFFIX) -m64
+TOOL_GCC64_AS        ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64
+TOOL_GCC64_AR        ?= $(TOOL_GCC64_PREFIX2)ar$(TOOL_GCC64_SUFFIX2)
+TOOL_GCC64_LD        ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64
+if1of ($(KBUILD_HOST), solaris)
+ TOOL_GCC64_LD_SYSMOD ?= $(TOOL_GCC64_PREFIX3)ld$(TOOL_GCC64_SUFFIX3)
+else
+ TOOL_GCC64_LD_SYSMOD ?= $(TOOL_GCC64_PREFIX2)ld$(TOOL_GCC64_SUFFIX2)
+endif
 ifndef TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET)
-TOOL_GCC64_LDFLAGS.dll ?= -shared
-else
-TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
+ TOOL_GCC64_LDFLAGS.dll ?= -shared
+else
+ TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
 endif
 TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
 TOOL_GCC64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
 ifeq ($(KBUILD_TARGET),os2)
-TOOL_GCC64_LD_MAP ?= -Zmap=$(1)
-else
-TOOL_GCC64_LD_MAP ?=
+ TOOL_GCC64_LD_MAP ?= -Zmap=$(1)
+else
+ TOOL_GCC64_LD_MAP ?=
 endif
 ifeq ($(KBUILD_TARGET),os2)
-TOOL_GCC64_LD_SYSMOD_MAP ?= -Zmap=$(1)
-else
-TOOL_GCC64_LD_SYSMOD_MAP ?=
-endif
-if1of ($(KBUILD_HOST), solaris)
- TOOL_GCC64_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
-else
- TOOL_GCC64_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
-endif
+ TOOL_GCC64_LD_SYSMOD_MAP ?= -Zmap=$(1)
+else
+ TOOL_GCC64_LD_SYSMOD_MAP ?=
+endif
+TOOL_GCC64_OBJCOPY ?= $(TOOL_GCC64_PREFIX2)gobjcopy$(TOOL_GCC64_SUFFIX2)
 
 ifdef SLKRUNS