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

trunk/kBuild/tools/GCC42MACHO.kmk

@@ -35 +35 @@
 
 # Tool Specific Properties
-TOOL_GCC42MACHO_PREFIX    ?=
-TOOL_GCC42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
+ifndef TOOL_GCC42MACHO_PREFIX
+ TOOL_GCC42MACHO_PREFIX   :=
+endif
+ifndef TOOL_GCC42MACHO_SUFFIX
+ TOOL_GCC42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
+endif
+TOOL_GCC42MACHO_PREFIX2   ?=
+TOOL_GCC42MACHO_SUFFIX2   ?=
 TOOL_GCC42MACHO_CC        ?= $(TOOL_GCC42MACHO_PREFIX)gcc$(TOOL_GCC42MACHO_SUFFIX)
 TOOL_GCC42MACHO_CXX       ?= $(TOOL_GCC42MACHO_PREFIX)g++$(TOOL_GCC42MACHO_SUFFIX)
@@ -44 +50 @@
 TOOL_GCC42MACHO_LD        ?= $(TOOL_GCC42MACHO_PREFIX)gcc$(TOOL_GCC42MACHO_SUFFIX)
 TOOL_GCC42MACHO_LD_SYSMOD ?= $(TOOL_GCC42MACHO_PREFIX)gcc$(TOOL_GCC42MACHO_SUFFIX)
-ifndef TOOL_GCC42MACHO_LDFLAGS.$(KBUILD_TARGET)
 TOOL_GCC42MACHO_LDFLAGS.dll ?= -dynamiclib
-else
-TOOL_GCC42MACHO_LDFLAGS.dll ?= $(TOOL_GCC42MACHO_LDFLAGS.$(KBUILD_TARGET))
-endif
 TOOL_GCC42MACHO_LDFLAGS.sysmod ?= -r
 #TOOL_GCC42MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
-TOOL_GCC42MACHO_DSYMUTIL  ?= dsymutil
 
 ifdef SLKRUNS
@@ -59 +60 @@
 TOOL_GCC42MACHO_OBJCXX    += -fmessage-length=0
 endif
+
+TOOL_GCC42MACHO_AR        ?= $(TOOL_GCC4MACHO_PREFIX2)ar$(TOOL_GCC4MACHO_SUFFIX2)
+TOOL_GCC42MACHO_DSYMUTIL  ?= $(TOOL_GCC4MACHO_PREFIX2)dsymutil$(TOOL_GCC4MACHO_SUFFIX2)
+TOOL_GCC42MACHO_STRIP     ?= $(TOOL_GCC4MACHO_PREFIX2)strip$(TOOL_GCC4MACHO_SUFFIX2)
+TOOL_GCC42MACHO_STRIP_PROGRAM ?= $(TOOL_GCC42MACHO_STRIP) -SXxru
+TOOL_GCC42MACHO_STRIP_DLL     ?= $(TOOL_GCC42MACHO_STRIP) -Sxru
+TOOL_GCC42MACHO_STRIP_SYSMOD  ?= $(TOOL_GCC42MACHO_STRIP) -Sru
 
 # General Properties used by kBuild
@@ -98 +106 @@
 TOOL_GCC42MACHO_ASOBJSUFF        ?= .o
 
-TOOL_GCC42MACHO_AR               ?= ar$(HOSTSUFF_EXE)
 TOOL_GCC42MACHO_ARFLAGS          ?= -c -rs
 TOOL_GCC42MACHO_ARLIBSUFF        ?= .a
@@ -105 +112 @@
 TOOL_GCC42MACHO_LDFLAGS.debug    ?= -g
 TOOL_GCC42MACHO_LDFLAGS.profile  ?= -g
-
-TOOL_GCC42MACHO_STRIP_PROGRAM    ?= strip -SXxru
-TOOL_GCC42MACHO_STRIP_DLL        ?= strip -Sxru
-TOOL_GCC42MACHO_STRIP_SYSMOD     ?= strip -Sru