Changeset 3392 in kBuild

Timestamp:

Jun 30, 2020 11:32:54 AM (5 years ago)

Author:

bird

Message:

LLVM*: Cleanups.

Location:

trunk/kBuild/tools

Files:

• LLVMGCC42MACHO.kmk (modified) (2 diffs)
• LLVMGXX42MACHO.kmk (modified) (2 diffs)

trunk/kBuild/tools/LLVMGCC42MACHO.kmk

@@ -35 +35 @@
 
 # Tool Specific Properties
-TOOL_LLVMGCC42MACHO_PREFIX    ?= llvm-
-TOOL_LLVMGCC42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
+ifndef TOOL_LLVMGCC42MACHO_PREFIX
+ TOOL_LLVMGCC42MACHO_PREFIX   := llvm-
+endif
+ifndef TOOL_LLVMGCC42MACHO_SUFFIX
+ TOOL_LLVMGCC42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
+endif
 TOOL_LLVMGCC42MACHO_CC        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
 TOOL_LLVMGCC42MACHO_CXX       ?= $(TOOL_LLVMGCC42MACHO_PREFIX)g++$(TOOL_LLVMGCC42MACHO_SUFFIX)
@@ -44 +48 @@
 TOOL_LLVMGCC42MACHO_LD        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
 TOOL_LLVMGCC42MACHO_LD_SYSMOD ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
-ifndef TOOL_LLVMGCC42MACHO_LDFLAGS.$(KBUILD_TARGET)
 TOOL_LLVMGCC42MACHO_LDFLAGS.dll ?= -dynamiclib
-else
-TOOL_LLVMGCC42MACHO_LDFLAGS.dll ?= $(TOOL_LLVMGCC42MACHO_LDFLAGS.$(KBUILD_TARGET))
-endif
 TOOL_LLVMGCC42MACHO_LDFLAGS.sysmod ?= -r
 #TOOL_LLVMGCC42MACHO_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_LLVMGCC42MACHO_DSYMUTIL  ?= dsymutil
+
+TOOL_LLVMGCC42MACHO_DSYMUTIL_PREFIX ?=
+TOOL_LLVMGCC42MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
+TOOL_LLVMGCC42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGCC42MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_LLVMGCC42MACHO_DSYMUTIL_SUFFIX)
 
 ifdef SLKRUNS

trunk/kBuild/tools/LLVMGXX42MACHO.kmk

@@ -35 +35 @@
 
 # Tool Specific Properties
-TOOL_LLVMGXX42MACHO_PREFIX    ?= llvm-
-TOOL_LLVMGXX42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
+ifndef TOOL_LLVMGXX42MACHO_PREFIX
+ TOOL_LLVMGXX42MACHO_PREFIX   := llvm-
+endif
+ifndef TOOL_LLVMGXX42MACHO_SUFFIX
+ TOOL_LLVMGXX42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
+endif
 TOOL_LLVMGXX42MACHO_CC        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
 TOOL_LLVMGXX42MACHO_CXX       ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
-TOOL_LLVMGXX42MACHO_PCH ?= $(TOOL_LLVMGXX42MACHO_CXX)
+TOOL_LLVMGXX42MACHO_PCH       ?= $(TOOL_LLVMGXX42MACHO_CXX)
 TOOL_LLVMGXX42MACHO_OBJC      ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
 TOOL_LLVMGXX42MACHO_OBJCXX    ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
@@ -45 +49 @@
 TOOL_LLVMGXX42MACHO_LD        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
 TOOL_LLVMGXX42MACHO_LD_SYSMOD ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
-ifndef TOOL_LLVMGXX42MACHO_LDFLAGS.$(KBUILD_TARGET)
 TOOL_LLVMGXX42MACHO_LDFLAGS.dll ?= -dynamiclib
-else
-TOOL_LLVMGXX42MACHO_LDFLAGS.dll ?= $(TOOL_LLVMGXX42MACHO_LDFLAGS.$(KBUILD_TARGET))
-endif
 TOOL_LLVMGXX42MACHO_LDFLAGS.sysmod ?= -r
 #TOOL_LLVMGXX42MACHO_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_LLVMGXX42MACHO_DSYMUTIL  ?= dsymutil
+
+TOOL_LLVMGXX42MACHO_DSYMUTIL_PREFIX ?=
+TOOL_LLVMGXX42MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
+TOOL_LLVMGXX42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGXX42MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_LLVMGXX42MACHO_DSYMUTIL_SUFFIX)
 
 ifdef SLKRUNS