Changeset 3401 for trunk/kBuild


Ignore:
Timestamp:
Jul 5, 2020, 5:58:36 PM (5 years ago)
Author:
bird
Message:

kBuild: Adding CLANGXXMACHO tool and MACOSX1013 sdk.

Location:
trunk/kBuild
Files:
1 added
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/sdks/MACOSX1013.kmk

    r3400 r3401  
    11# $Id$
    22## @file
    3 # kBuild SDK - Mac OS X v10.5 SDK.
     3# kBuild SDK - Mac OS X v10.13 SDK.
    44#
    55
    66#
    7 # Copyright (c) 2008-2017 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
     7# Copyright (c) 2008-2020 knut st. osmundsen <bird-kBuild-spam-xx@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    3232#
    3333
    34 SDK_MACOSX105 := Mac OS X v10.5 SDK
     34ifndef INCLUDED_DARWIN_COMMON_KMK
     35 include $(KBUILD_PATH)/darwin-common.kmk
     36endif
     37
     38SDK_MACOSX1013 := Mac OS X v10.13 SDK
    3539
    3640# SDK Specific Properties
    37 ifndef PATH_SDK_MACOSX105
    38  PATH_SDK_MACOSX105 := /Developer/SDKs/MacOSX10.5.sdk
     41ifndef PATH_SDK_MACOSX1013
     42 PATH_SDK_MACOSX1013 := $(call DARWINCMN_FN_FIND_MACOSX_SDK,MacOSX10.13.sdk)
    3943else
    4044 # Resolve any fancy stuff once and for all.
    41  PATH_SDK_MACOSX105 := $(PATH_SDK_MACOSX105)
     45 PATH_SDK_MACOSX1013 := $(PATH_SDK_MACOSX1013)
    4246endif
     47ifeq ($(PATH_SDK_MACOSX1013),)
     48 $(warning $(call DARWINCMN_FN_ERROR_MACOSX_SDK,MacOSX10.13.sdk))
     49endif
     50
     51## The MAC_OS_X_VERSION_MIN_REQUIRED and MAC_OS_X_VERSION_MAX_ALLOWED value for this SDK.
     52SDK_MACOSX1013_VERSION_VALUE := 101300
    4353
    4454# General Properties (used by kBuild)
    4555# Note: The MAC_OS_X_VERSION_MAX_ALLOWED is left free for the SDK user to define.
    46 SDK_MACOSX105_DEFS      ?= MAC_OS_X_VERSION_MIN_REQUIRED=1050
    47 SDK_MACOSX105_CFLAGS    ?= -mmacosx-version-min=10.5 -isysroot $(PATH_SDK_MACOSX105)
    48 SDK_MACOSX105_CXXFLAGS  ?= -mmacosx-version-min=10.5 -isysroot $(PATH_SDK_MACOSX105)
    49 SDK_MACOSX105_OBJCFLAGS ?= -mmacosx-version-min=10.5 -isysroot $(PATH_SDK_MACOSX105)
    50 SDK_MACOSX105_LDFLAGS   ?= -mmacosx-version-min=10.5 -Wl,-syslibroot,$(PATH_SDK_MACOSX105)
     56SDK_MACOSX1013_DEFS      ?= MAC_OS_X_VERSION_MIN_REQUIRED=101300
     57SDK_MACOSX1013_CFLAGS    ?= -mmacosx-version-min=10.13 -isysroot $(PATH_SDK_MACOSX1013)
     58SDK_MACOSX1013_CXXFLAGS  ?= -mmacosx-version-min=10.13 -isysroot $(PATH_SDK_MACOSX1013)
     59SDK_MACOSX1013_OBJCFLAGS ?= -mmacosx-version-min=10.13 -isysroot $(PATH_SDK_MACOSX1013)
     60SDK_MACOSX1013_LDFLAGS   ?= -mmacosx-version-min=10.13 -isysroot $(PATH_SDK_MACOSX1013)
    5161

  • trunk/kBuild/sdks/MACOSX1013INCS.kmk

    r3400 r3401  
    11# $Id$
    22## @file
    3 # kBuild SDK - Mac OS X v10.5 SDK, includes only.
     3# kBuild SDK - Mac OS X v10.13 SDK, includes only.
    44#
    55
    66#
    7 # Copyright (c) 2008-2017 knut st. osmundsen <bird-kBuild-spam-xviiv@anduin.net>
     7# Copyright (c) 2008-2020 knut st. osmundsen <bird-kBuild-spam-xx@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    3232#
    3333
    34 SDK_MACOSX105INCS := Mac OS X v10.5 SDK
     34ifndef SDK_MACOSX1013
     35 include $(KBUILD_PATH)/sdks/MACOSX1013.kmk
     36endif
     37
     38SDK_MACOSX1013INCS := Mac OS X v10.13 SDK, include only.
    3539
    3640# SDK Specific Properties
    37 ifndef PATH_SDK_MACOSX105INCS
    38  ifdef PATH_SDK_MACOSX105
    39   PATH_SDK_MACOSX105INCS := $(PATH_SDK_MACOSX105)
    40  else
    41   PATH_SDK_MACOSX105INCS := /Developer/SDKs/MacOSX10.5.sdk
    42  endif
     41ifndef PATH_SDK_MACOSX1013INCS
     42 PATH_SDK_MACOSX1013INCS := $(PATH_SDK_MACOSX1013)
    4343else
    44  # Resolve any fancy stuff once and for all.
    45  PATH_SDK_MACOSX105INCS := $(PATH_SDK_MACOSX105INCS)
     44 PATH_SDK_MACOSX1013INCS := $(PATH_SDK_MACOSX1013INCS)
    4645endif
    4746
    4847# General Properties (used by kBuild)
    49 SDK_MACOSX105INCS_INCS   = $(PATH_SDK_MACOSX105INCS)/usr/include
     48SDK_MACOSX1013INCS_INCS = $(PATH_SDK_MACOSX1013INCS)/usr/include
    5049

  • trunk/kBuild/tools/CLANGXXMACHO.kmk

    r3400 r3401  
    3232#
    3333
    34 TOOL_LLVMGXX42MACHO := LLVM GCC v4.2.x targeting Darwin (Mac OS X) Mach-O, for building C++ code.
     34ifndef INCLUDED_DARWIN_COMMON_KMK
     35 include $(KBUILD_PATH)/darwin-common.kmk
     36endif
     37
     38TOOL_CLANGXXMACHO := LLVM Clang targeting Darwin (Mac OS X) Mach-O, for building C++ code.
    3539
    3640# Tool Specific Properties
    37 ifndef TOOL_LLVMGXX42MACHO_PREFIX
    38  TOOL_LLVMGXX42MACHO_PREFIX   := llvm-
    39 endif
    40 ifndef TOOL_LLVMGXX42MACHO_SUFFIX
    41  TOOL_LLVMGXX42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
    42 endif
    43 TOOL_LLVMGXX42MACHO_PREFIX2   ?=
    44 TOOL_LLVMGXX42MACHO_SUFFIX2   ?= $(HOSTSUFF_EXE)
    45 TOOL_LLVMGXX42MACHO_CC        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
    46 TOOL_LLVMGXX42MACHO_CXX       ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
    47 TOOL_LLVMGXX42MACHO_PCH       ?= $(TOOL_LLVMGXX42MACHO_CXX)
    48 TOOL_LLVMGXX42MACHO_OBJC      ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
    49 TOOL_LLVMGXX42MACHO_OBJCXX    ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
    50 TOOL_LLVMGXX42MACHO_AS        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
    51 TOOL_LLVMGXX42MACHO_LD        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
    52 TOOL_LLVMGXX42MACHO_LD_SYSMOD ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
    53 TOOL_LLVMGXX42MACHO_LDFLAGS.dll ?= -dynamiclib
    54 TOOL_LLVMGXX42MACHO_LDFLAGS.sysmod ?= -r
    55 #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)))
    56 
    57 TOOL_LLVMGXX42MACHO_AR        ?= $(TOOL_LLVMGXX42MACHO_PREFIX2)ar$(TOOL_LLVMGXX42MACHO_SUFFIX2)
    58 TOOL_LLVMGXX42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGXX42MACHO_PREFIX2)dsymutil$(TOOL_LLVMGXX42MACHO_SUFFIX2)
    59 TOOL_LLVMGXX42MACHO_STRIP     ?= $(TOOL_LLVMGXX42MACHO_PREFIX2)strip$(TOOL_LLVMGXX42MACHO_SUFFIX2)
    60 TOOL_LLVMGXX42MACHO_STRIP_PROGRAM ?= $(TOOL_LLVMGXX42MACHO_STRIP) -SXxru
    61 TOOL_LLVMGXX42MACHO_STRIP_DLL     ?= $(TOOL_LLVMGXX42MACHO_STRIP) -Sxru
    62 TOOL_LLVMGXX42MACHO_STRIP_SYSMOD  ?= $(TOOL_LLVMGXX42MACHO_STRIP) -Sru
     41# PREFIX/SUFFIX: clang;   PREFIX2/SUFFIX2: cctool;
     42ifndef PATH_TOOL_CLANGXXMACHO
     43 PATH_TOOL_CLANGXXMACHO := $(substr $(firstfile $(foreachfile toolchaindir, $(DARWINCMN_TOOLCHAIN_DIRS) \
     44        , $(qwildcard ,$(toolchaindir)/usr/bin/clang++))), 1, -12)
     45else
     46 PATH_TOOL_CLANGXXMACHO := $(PATH_TOOL_CLANGXXMACHO)
     47endif
     48ifndef TOOL_CLANGXXMACHO_PREFIX
     49 ifdef PATH_TOOL_CLANGXXMACHO
     50  TOOL_CLANGXXMACHO_PREFIX  := $(PATH_TOOL_CLANGXXMACHO)/bin/
     51 else
     52  TOOL_CLANGXXMACHO_PREFIX  :=
     53 endif
     54endif
     55ifndef TOOL_CLANGXXMACHO_SUFFIX
     56 TOOL_CLANGXXMACHO_SUFFIX   := $(HOSTSUFF_EXE)
     57endif
     58TOOL_CLANGXXMACHO_PREFIX2   ?= $(TOOL_CLANGXXMACHO_PREFIX)
     59TOOL_CLANGXXMACHO_SUFFIX2   ?= $(TOOL_CLANGXXMACHO_SUFFIX)
     60TOOL_CLANGXXMACHO_CC        ?= $(TOOL_CLANGXXMACHO_PREFIX)clang$(TOOL_CLANGXXMACHO_SUFFIX)
     61TOOL_CLANGXXMACHO_CXX       ?= $(TOOL_CLANGXXMACHO_PREFIX)clang++$(TOOL_CLANGXXMACHO_SUFFIX)
     62TOOL_CLANGXXMACHO_PCH       ?= $(TOOL_CLANGXXMACHO_CXX)
     63TOOL_CLANGXXMACHO_OBJC      ?= $(TOOL_CLANGXXMACHO_PREFIX)clang$(TOOL_CLANGXXMACHO_SUFFIX)
     64TOOL_CLANGXXMACHO_OBJCXX    ?= $(TOOL_CLANGXXMACHO_PREFIX)clang$(TOOL_CLANGXXMACHO_SUFFIX)
     65TOOL_CLANGXXMACHO_AS        ?= $(TOOL_CLANGXXMACHO_PREFIX)clang$(TOOL_CLANGXXMACHO_SUFFIX)
     66TOOL_CLANGXXMACHO_LD        ?= $(TOOL_CLANGXXMACHO_PREFIX)clang++$(TOOL_CLANGXXMACHO_SUFFIX)
     67TOOL_CLANGXXMACHO_LD_SYSMOD ?= $(TOOL_CLANGXXMACHO_PREFIX)clang++$(TOOL_CLANGXXMACHO_SUFFIX)
     68TOOL_CLANGXXMACHO_LDFLAGS.dll ?= -dynamiclib
     69TOOL_CLANGXXMACHO_LDFLAGS.sysmod ?= -r
     70#TOOL_CLANGXXMACHO_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)))
     71TOOL_CLANGXXMACHO_DSYMUTIL  ?= $(TOOL_CLANGXXMACHO_PREFIX)dsymutil$(TOOL_CLANGXXMACHO_SUFFIX)
     72
     73TOOL_CLANGXXMACHO_AR        ?= $(TOOL_CLANGXXMACHO_PREFIX2)ar$(TOOL_CLANGXXMACHO_SUFFIX2)
     74TOOL_CLANGXXMACHO_STRIP     ?= $(TOOL_CLANGXXMACHO_PREFIX2)strip$(TOOL_CLANGXXMACHO_SUFFIX2)
     75TOOL_CLANGXXMACHO_STRIP_PROGRAM ?= $(TOOL_CLANGXXMACHO_STRIP) -SXxru
     76TOOL_CLANGXXMACHO_STRIP_DLL     ?= $(TOOL_CLANGXXMACHO_STRIP) -Sxru
     77TOOL_CLANGXXMACHO_STRIP_SYSMOD  ?= $(TOOL_CLANGXXMACHO_STRIP) -Sru
    6378
    6479ifdef SLKRUNS
    65 TOOL_LLVMGXX42MACHO_CC     += -fmessage-length=0
    66 TOOL_LLVMGXX42MACHO_CXX    += -fmessage-length=0
    67 TOOL_LLVMGXX42MACHO_OBJC   += -fmessage-length=0
    68 TOOL_LLVMGXX42MACHO_OBJCXX += -fmessage-length=0
     80TOOL_CLANGXXMACHO_CC     += -fmessage-length=0
     81TOOL_CLANGXXMACHO_CXX    += -fmessage-length=0
     82TOOL_CLANGXXMACHO_OBJC   += -fmessage-length=0
     83TOOL_CLANGXXMACHO_OBJCXX += -fmessage-length=0
    6984endif
    7085
    7186# General Properties used by kBuild
    72 TOOL_LLVMGXX42MACHO_COBJSUFF         ?= .o
    73 TOOL_LLVMGXX42MACHO_CFLAGS           ?=
    74 TOOL_LLVMGXX42MACHO_CFLAGS.debug     ?= -g
    75 TOOL_LLVMGXX42MACHO_CFLAGS.profile   ?= -O2 #-g -pg
    76 TOOL_LLVMGXX42MACHO_CFLAGS.release   ?= -O2
    77 TOOL_LLVMGXX42MACHO_CINCS            ?=
    78 TOOL_LLVMGXX42MACHO_CDEFS            ?=
    79 
    80 TOOL_LLVMGXX42MACHO_CXXOBJSUFF       ?= .o
    81 TOOL_LLVMGXX42MACHO_CXXFLAGS         ?=
    82 TOOL_LLVMGXX42MACHO_CXXFLAGS.debug   ?= -g
    83 TOOL_LLVMGXX42MACHO_CXXFLAGS.profile ?= -O2 #-g -pg
    84 TOOL_LLVMGXX42MACHO_CXXFLAGS.release ?= -O2
    85 TOOL_LLVMGXX42MACHO_CXXINCS          ?=
    86 TOOL_LLVMGXX42MACHO_CXXDEFS          ?=
    87 
    88 TOOL_LLVMGXX42MACHO_PCHOBJSUFF       ?= .h.gch
    89 TOOL_LLVMGXX42MACHO_PCHFLAGS         ?= $(TOOL_LLVMGXX42MACHO_CXXFLAGS)
    90 TOOL_LLVMGXX42MACHO_PCHFLAGS.debug   ?= $(TOOL_LLVMGXX42MACHO_CXXFLAGS.debug)
    91 TOOL_LLVMGXX42MACHO_PCHFLAGS.profile ?= $(TOOL_LLVMGXX42MACHO_CXXFLAGS.profile)
    92 TOOL_LLVMGXX42MACHO_PCHFLAGS.release ?= $(TOOL_LLVMGXX42MACHO_CXXFLAGS.release)
    93 TOOL_LLVMGXX42MACHO_PCHINCS          ?= $(TOOL_LLVMGXX42MACHO_CXXINCS)
    94 TOOL_LLVMGXX42MACHO_PCHDEFS          ?= $(TOOL_LLVMGXX42MACHO_CXXDEFS)
    95 
    96 TOOL_LLVMGXX42MACHO_OBJCOBJSUFF      ?= .o
    97 TOOL_LLVMGXX42MACHO_OBJCFLAGS        ?=
    98 TOOL_LLVMGXX42MACHO_OBJCFLAGS.debug  ?= -g
    99 TOOL_LLVMGXX42MACHO_OBJCFLAGS.profile?= -O2 #-g -pg
    100 TOOL_LLVMGXX42MACHO_OBJCFLAGS.release?= -O2
    101 TOOL_LLVMGXX42MACHO_OBJCINCS         ?=
    102 TOOL_LLVMGXX42MACHO_OBJCDEFS         ?=
    103 
    104 TOOL_LLVMGXX42MACHO_OBJCXXOBJSUFF        ?= .o
    105 TOOL_LLVMGXX42MACHO_OBJCXXFLAGS          ?=
    106 TOOL_LLVMGXX42MACHO_OBJCXXFLAGS.debug    ?= -g
    107 TOOL_LLVMGXX42MACHO_OBJCXXFLAGS.profile  ?= -O2 #-g -pg
    108 TOOL_LLVMGXX42MACHO_OBJCXXFLAGS.release  ?= -O2
    109 TOOL_LLVMGXX42MACHO_OBJCXXINCS           ?=
    110 TOOL_LLVMGXX42MACHO_OBJCXXDEFS           ?=
    111 
    112 TOOL_LLVMGXX42MACHO_ASFLAGS          ?= -x assembler-with-cpp
    113 TOOL_LLVMGXX42MACHO_ASFLAGS.debug    ?= -g
    114 TOOL_LLVMGXX42MACHO_ASFLAGS.profile  ?= -g
    115 TOOL_LLVMGXX42MACHO_ASOBJSUFF        ?= .o
    116 
    117 TOOL_LLVMGXX42MACHO_ARFLAGS          ?= -c -rs
    118 TOOL_LLVMGXX42MACHO_ARLIBSUFF        ?= .a
    119 
    120 TOOL_LLVMGXX42MACHO_LDFLAGS          ?=
    121 TOOL_LLVMGXX42MACHO_LDFLAGS.debug    ?= -g
    122 TOOL_LLVMGXX42MACHO_LDFLAGS.profile  ?= -g
     87TOOL_CLANGXXMACHO_COBJSUFF         ?= .o
     88TOOL_CLANGXXMACHO_CFLAGS           ?=
     89TOOL_CLANGXXMACHO_CFLAGS.debug     ?= -g
     90TOOL_CLANGXXMACHO_CFLAGS.profile   ?= -O2 #-g -pg
     91TOOL_CLANGXXMACHO_CFLAGS.release   ?= -O2
     92TOOL_CLANGXXMACHO_CINCS            ?=
     93TOOL_CLANGXXMACHO_CDEFS            ?=
     94
     95TOOL_CLANGXXMACHO_CXXOBJSUFF       ?= .o
     96TOOL_CLANGXXMACHO_CXXFLAGS         ?=
     97TOOL_CLANGXXMACHO_CXXFLAGS.debug   ?= -g
     98TOOL_CLANGXXMACHO_CXXFLAGS.profile ?= -O2 #-g -pg
     99TOOL_CLANGXXMACHO_CXXFLAGS.release ?= -O2
     100TOOL_CLANGXXMACHO_CXXINCS          ?=
     101TOOL_CLANGXXMACHO_CXXDEFS          ?=
     102
     103TOOL_CLANGXXMACHO_PCHOBJSUFF       ?= .h.gch
     104TOOL_CLANGXXMACHO_PCHFLAGS         ?= $(TOOL_CLANGXXMACHO_CXXFLAGS)
     105TOOL_CLANGXXMACHO_PCHFLAGS.debug   ?= $(TOOL_CLANGXXMACHO_CXXFLAGS.debug)
     106TOOL_CLANGXXMACHO_PCHFLAGS.profile ?= $(TOOL_CLANGXXMACHO_CXXFLAGS.profile)
     107TOOL_CLANGXXMACHO_PCHFLAGS.release ?= $(TOOL_CLANGXXMACHO_CXXFLAGS.release)
     108TOOL_CLANGXXMACHO_PCHINCS          ?= $(TOOL_CLANGXXMACHO_CXXINCS)
     109TOOL_CLANGXXMACHO_PCHDEFS          ?= $(TOOL_CLANGXXMACHO_CXXDEFS)
     110
     111TOOL_CLANGXXMACHO_OBJCOBJSUFF      ?= .o
     112TOOL_CLANGXXMACHO_OBJCFLAGS        ?=
     113TOOL_CLANGXXMACHO_OBJCFLAGS.debug  ?= -g
     114TOOL_CLANGXXMACHO_OBJCFLAGS.profile?= -O2 #-g -pg
     115TOOL_CLANGXXMACHO_OBJCFLAGS.release?= -O2
     116TOOL_CLANGXXMACHO_OBJCINCS         ?=
     117TOOL_CLANGXXMACHO_OBJCDEFS         ?=
     118
     119TOOL_CLANGXXMACHO_OBJCXXOBJSUFF        ?= .o
     120TOOL_CLANGXXMACHO_OBJCXXFLAGS          ?=
     121TOOL_CLANGXXMACHO_OBJCXXFLAGS.debug    ?= -g
     122TOOL_CLANGXXMACHO_OBJCXXFLAGS.profile  ?= -O2 #-g -pg
     123TOOL_CLANGXXMACHO_OBJCXXFLAGS.release  ?= -O2
     124TOOL_CLANGXXMACHO_OBJCXXINCS           ?=
     125TOOL_CLANGXXMACHO_OBJCXXDEFS           ?=
     126
     127TOOL_CLANGXXMACHO_ASFLAGS          ?= -x assembler-with-cpp
     128TOOL_CLANGXXMACHO_ASFLAGS.debug    ?= -g
     129TOOL_CLANGXXMACHO_ASFLAGS.profile  ?= -g
     130TOOL_CLANGXXMACHO_ASOBJSUFF        ?= .o
     131
     132TOOL_CLANGXXMACHO_ARFLAGS          ?= -c -rs
     133TOOL_CLANGXXMACHO_ARLIBSUFF        ?= .a
     134
     135TOOL_CLANGXXMACHO_LDFLAGS          ?=
     136TOOL_CLANGXXMACHO_LDFLAGS.debug    ?= -g
     137TOOL_CLANGXXMACHO_LDFLAGS.profile  ?= -g
    123138
    124139
    … …  
    126141##
    127142# Calculate the files in the debug bundle.
    128 # @param    1           The whole output filename.
    129 # @param    2           The output filename sans suffix.
    130 TOOL_LLVMGXX42MACHO_DEBUG_BUNDLE_FN = \
    131     $(1).dSYM/ \
    132     $(1).dSYM/Contents/ \
    133     $(1).dSYM/Contents/Resources/ \
    134     $(1).dSYM/Contents/Resources/DWARF/ \
     143# @param    1  The whole output filename.
     144# @param    2  The output filename sans suffix.
     145TOOL_CLANGXXMACHO_DEBUG_BUNDLE_FN = \
    135146    $(1).dSYM/Contents/Info.plist \
    136147    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))
    … …  
    138149##
    139150# Calculate the files in the debug bundle.
    140 # @param    1           The whole linker output filename.
    141 # @param    2           The linker output filename sans suffix.
    142 # @param    3           The desired install name (no dir slash).
     151# @param    1  The whole linker output filename.
     152# @param    2  The linker output filename sans suffix.
     153# @param    3  The desired install name (no dir slash).
    143154# @remarks  The Info.plist has some reference to the original name, but gdb
    144155#           does not care and only check for a symbol file in the DWARF
    145156#           directory with the same name as the debugged module.
    146 TOOL_LLVMGXX42MACHO_DEBUG_INSTALL_FN= \
     157TOOL_CLANGXXMACHO_DEBUG_INSTALL_FN= \
    147158    $(3).dSYM/ \
    148159    $(3).dSYM/Contents/ \
    … …  
    166177# @param    $(outbase)  Output basename (full). Use this for list files and such.
    167178# @param    $(objsuff)  Object suffix.
    168 TOOL_LLVMGXX42MACHO_COMPILE_C_DEPEND =
    169 TOOL_LLVMGXX42MACHO_COMPILE_C_DEPORD =
    170 TOOL_LLVMGXX42MACHO_COMPILE_C_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).i,)
    171 TOOL_LLVMGXX42MACHO_COMPILE_C_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
    172 define TOOL_LLVMGXX42MACHO_COMPILE_C_CMDS
     179TOOL_CLANGXXMACHO_COMPILE_C_DEPEND =
     180TOOL_CLANGXXMACHO_COMPILE_C_DEPORD =
     181TOOL_CLANGXXMACHO_COMPILE_C_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).i,)
     182TOOL_CLANGXXMACHO_COMPILE_C_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
     183define TOOL_CLANGXXMACHO_COMPILE_C_CMDS
    173184if "$(use_objcache)" != ""
    174185        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
    175186                --kObjCache-cpp $(outbase).i\
    176                 $(TOOL_LLVMGXX42MACHO_CC) -E -o -\
     187                $(TOOL_CLANGXXMACHO_CC) -E -o -\
    177188                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    178189                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    179190                $(abspath $(source))\
    180191                --kObjCache-cc $(obj)\
    181                 $(TOOL_LLVMGXX42MACHO_CC) -c\
     192                $(TOOL_CLANGXXMACHO_CC) -c\
    182193                $(flags) -fpreprocessed -x c\
    183194                -o $(obj)\
    184195                -
    185196else
    186         $(QUIET)$(TOOL_LLVMGXX42MACHO_CC) -c\
     197        $(QUIET)$(TOOL_CLANGXXMACHO_CC) -c\
    187198                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    188199                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    206217# @param    $(outbase)  Output basename (full). Use this for list files and such.
    207218# @param    $(objsuff)  Object suffix.
    208 TOOL_LLVMGXX42MACHO_COMPILE_CXX_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).ii,)
    209 TOOL_LLVMGXX42MACHO_COMPILE_CXX_DEPEND         = $($(target)_1_GCC_PCH_FILE)
    210 TOOL_LLVMGXX42MACHO_COMPILE_CXX_DEPORD         =
    211 TOOL_LLVMGXX42MACHO_COMPILE_CXX_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
    212 define TOOL_LLVMGXX42MACHO_COMPILE_CXX_CMDS
     219TOOL_CLANGXXMACHO_COMPILE_CXX_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).ii,)
     220TOOL_CLANGXXMACHO_COMPILE_CXX_DEPEND         = $($(target)_1_GCC_PCH_FILE)
     221TOOL_CLANGXXMACHO_COMPILE_CXX_DEPORD         =
     222TOOL_CLANGXXMACHO_COMPILE_CXX_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
     223define TOOL_CLANGXXMACHO_COMPILE_CXX_CMDS
    213224if "$(use_objcache)" != ""
    214225        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
    215226                --kObjCache-cpp $(outbase).ii\
    216                 $(TOOL_LLVMGXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
     227                $(TOOL_CLANGXXMACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
    217228                ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
    218229                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    … …  
    220231                $(abspath $(source))\
    221232                --kObjCache-cc $(obj)\
    222                 $(TOOL_LLVMGXX42MACHO_CXX) -c\
     233                $(TOOL_CLANGXXMACHO_CXX) -c\
    223234                $(flags) -fpreprocessed $(if-expr defined($(target)_PCH_HDR),-fpch-preprocess,) -x c++\
    224235                -o $(obj)\
    225236                -
    226237else
    227         $(QUIET)$(TOOL_LLVMGXX42MACHO_CXX) -c\
     238        $(QUIET)$(TOOL_CLANGXXMACHO_CXX) -c\
    228239                $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
    229240                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    248259# @param    $(outbase)  Output basename (full). Use this for list files and such.
    249260# @param    $(objsuff)  Object suffix.
    250 TOOL_LLVMGXX42MACHO_COMPILE_PCH_OUTPUT = $($(target)_1_GCC_PCH_FILE)
    251 TOOL_LLVMGXX42MACHO_COMPILE_PCH_DEPEND =
    252 TOOL_LLVMGXX42MACHO_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
    253 define TOOL_LLVMGXX42MACHO_COMPILE_PCH_CMDS
    254         $(QUIET)$(TOOL_LLVMGXX42MACHO_PCH) -c\
     261TOOL_CLANGXXMACHO_COMPILE_PCH_OUTPUT = $($(target)_1_GCC_PCH_FILE)
     262TOOL_CLANGXXMACHO_COMPILE_PCH_DEPEND =
     263TOOL_CLANGXXMACHO_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR)
     264define TOOL_CLANGXXMACHO_COMPILE_PCH_CMDS
     265        $(QUIET)$(TOOL_CLANGXXMACHO_PCH) -c\
    255266                $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
    256267                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    274285# @param    $(outbase)  Output basename (full). Use this for list files and such.
    275286# @param    $(objsuff)  Object suffix.
    276 TOOL_LLVMGXX42MACHO_COMPILE_OBJC_DEPEND =
    277 TOOL_LLVMGXX42MACHO_COMPILE_OBJC_DEPORD =
     287TOOL_CLANGXXMACHO_COMPILE_OBJC_DEPEND =
     288TOOL_CLANGXXMACHO_COMPILE_OBJC_DEPORD =
    278289ifdef KBUILD_USE_KOBJCACHE
    279 TOOL_LLVMGXX42MACHO_COMPILE_OBJC_USES_KOBJCACHE = 1
    280 TOOL_LLVMGXX42MACHO_COMPILE_OBJC_OUTPUT = $(outbase).mi
    281 define TOOL_LLVMGXX42MACHO_COMPILE_OBJC_CMDS
     290TOOL_CLANGXXMACHO_COMPILE_OBJC_USES_KOBJCACHE = 1
     291TOOL_CLANGXXMACHO_COMPILE_OBJC_OUTPUT = $(outbase).mi
     292define TOOL_CLANGXXMACHO_COMPILE_OBJC_CMDS
    282293        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
    283294                --kObjCache-cpp $(outbase).ii\
    284                 $(TOOL_LLVMGXX42MACHO_OBJC) -E -o -\
     295                $(TOOL_CLANGXXMACHO_OBJC) -E -o -\
    285296                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    286297                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    287298                $(abspath $(source))\
    288299                --kObjCache-cc $(obj)\
    289                 $(TOOL_LLVMGXX42MACHO_OBJC) -c\
     300                $(TOOL_CLANGXXMACHO_OBJC) -c\
    290301                $(flags) -fpreprocessed -x objective-c \
    291302                -o $(obj)\
    … …  
    294305endef
    295306else  # !KBUILD_USE_KOBJCACHE
    296 TOOL_LLVMGXX42MACHO_COMPILE_OBJC_OUTPUT =
    297 define TOOL_LLVMGXX42MACHO_COMPILE_OBJC_CMDS
    298         $(QUIET)$(TOOL_LLVMGXX42MACHO_OBJC) -c\
     307TOOL_CLANGXXMACHO_COMPILE_OBJC_OUTPUT =
     308define TOOL_CLANGXXMACHO_COMPILE_OBJC_CMDS
     309        $(QUIET)$(TOOL_CLANGXXMACHO_OBJC) -c\
    299310                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    300311                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    318329# @param    $(outbase)  Output basename (full). Use this for list files and such.
    319330# @param    $(objsuff)  Object suffix.
    320 TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_DEPEND =
    321 TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_DEPORD =
     331TOOL_CLANGXXMACHO_COMPILE_OBJCXX_DEPEND =
     332TOOL_CLANGXXMACHO_COMPILE_OBJCXX_DEPORD =
    322333ifdef KBUILD_USE_KOBJCACHE
    323 TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_USES_KOBJCACHE = 1
    324 TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_OUTPUT = $(outbase).mii
    325 define TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_CMDS
     334TOOL_CLANGXXMACHO_COMPILE_OBJCXX_USES_KOBJCACHE = 1
     335TOOL_CLANGXXMACHO_COMPILE_OBJCXX_OUTPUT = $(outbase).mii
     336define TOOL_CLANGXXMACHO_COMPILE_OBJCXX_CMDS
    326337        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
    327338                --kObjCache-cpp $(outbase).mii\
    328                 $(TOOL_LLVMGXX42MACHO_OBJCXX) -E -o -\
     339                $(TOOL_CLANGXXMACHO_OBJCXX) -E -o -\
    329340                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    330341                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    331342                $(abspath $(source))\
    332343                --kObjCache-cc $(obj)\
    333                 $(TOOL_LLVMGXX42MACHO_OBJCXX) -c\
     344                $(TOOL_CLANGXXMACHO_OBJCXX) -c\
    334345                $(flags) -fpreprocessed -x objective-c++ \
    335346                -o $(obj)\
    … …  
    338349endef
    339350else  # !KBUILD_USE_KOBJCACHE
    340 TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_OUTPUT =
    341 define TOOL_LLVMGXX42MACHO_COMPILE_OBJCXX_CMDS
    342         $(QUIET)$(TOOL_LLVMGXX42MACHO_OBJCXX) -c\
     351TOOL_CLANGXXMACHO_COMPILE_OBJCXX_OUTPUT =
     352define TOOL_CLANGXXMACHO_COMPILE_OBJCXX_CMDS
     353        $(QUIET)$(TOOL_CLANGXXMACHO_OBJCXX) -c\
    343354                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    344355                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    363374# @param    $(objsuff)  Object suffix.
    364375#
    365 TOOL_LLVMGXX42MACHO_COMPILE_AS_OUTPUT =
    366 TOOL_LLVMGXX42MACHO_COMPILE_AS_DEPEND =
    367 TOOL_LLVMGXX42MACHO_COMPILE_AS_DEPORD =
    368 define TOOL_LLVMGXX42MACHO_COMPILE_AS_CMDS
    369         $(QUIET)$(TOOL_LLVMGXX42MACHO_AS) -c\
     376TOOL_CLANGXXMACHO_COMPILE_AS_OUTPUT =
     377TOOL_CLANGXXMACHO_COMPILE_AS_DEPEND =
     378TOOL_CLANGXXMACHO_COMPILE_AS_DEPORD =
     379define TOOL_CLANGXXMACHO_COMPILE_AS_CMDS
     380        $(QUIET)$(TOOL_CLANGXXMACHO_AS) -c\
    370381                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    371382                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    378389## Link library
    379390# @param    $(target)   Normalized main target name.
    380 # @param    $(out)              Library name.
     391# @param    $(out)      Library name.
    381392# @param    $(objs)     Object files to put in the library.
    382393# @param    $(flags)    Flags.
    383394# @param    $(dirdep)   Directory creation dependency.
    384 # @param    $(deps)             Other dependencies.
     395# @param    $(deps)     Other dependencies.
    385396# @param    $(othersrc) Unhandled sources.
    386397# @param    $(outbase)  Output basename (full). Use this for list files and such.
    387 TOOL_LLVMGXX42MACHO_LINK_LIBRARY_OUTPUT =
    388 TOOL_LLVMGXX42MACHO_LINK_LIBRARY_DEPEND = $(othersrc)
    389 TOOL_LLVMGXX42MACHO_LINK_LIBRARY_DEPORD =
    390 define TOOL_LLVMGXX42MACHO_LINK_LIBRARY_CMDS
    391         $(if $(strip $(filter-out %.h.gch,$(objs))),$(call xargs,$(QUIET)$(TOOL_LLVMGXX42MACHO_AR) $(flags) $(out),$(filter-out %.h.gch,$(objs))))
     398TOOL_CLANGXXMACHO_LINK_LIBRARY_OUTPUT =
     399TOOL_CLANGXXMACHO_LINK_LIBRARY_DEPEND = $(othersrc)
     400TOOL_CLANGXXMACHO_LINK_LIBRARY_DEPORD =
     401define TOOL_CLANGXXMACHO_LINK_LIBRARY_CMDS
     402        $(if $(strip $(filter-out %.h.gch,$(objs))),$(call xargs,$(QUIET)$(TOOL_CLANGXXMACHO_AR) $(flags) $(out),$(filter-out %.h.gch,$(objs))))
    392403        $(foreach lib,$(othersrc)\
    393404                ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
    … …  
    395406                $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \
    396407                $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \
    397                         && $(TOOL_LLVMGXX42MACHO_AR) -x $(abspath $(lib)) \
     408                        && $(TOOL_CLANGXXMACHO_AR) -x $(abspath $(lib)) \
    398409                    && $(RM_EXT) -f ./__.SYMDEF* \
    399                         && $(TOOL_LLVMGXX42MACHO_AR) $(flags) $(out) *) \
     410                        && $(TOOL_CLANGXXMACHO_AR) $(flags) $(out) *) \
    400411                $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \
    401412                $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/)
    … …  
    405416## Link program
    406417# @param    $(target)   Normalized main target name.
    407 # @param    $(out)              Program name.
     418# @param    $(out)      Program name.
    408419# @param    $(objs)     Object files to link together.
    409420# @param    $(libs)     Libraries to search.
    … …  
    411422# @param    $(flags)    Flags.
    412423# @param    $(dirdep)   Directory creation dependency.
    413 # @param    $(deps)             Other dependencies.
     424# @param    $(deps)     Other dependencies.
    414425# @param    $(othersrc) Unhandled sources.
    415426# @param    $(custom_pre)   Custom step invoked before linking.
    416427# @param    $(custom_post)  Custom step invoked after linking.
    417428# @param    $(outbase)  Output basename (full). Use this for list files and such.
    418 TOOL_LLVMGXX42MACHO_LINK_PROGRAM_OUTPUT = $(outbase).rsp
    419 TOOL_LLVMGXX42MACHO_LINK_PROGRAM_OUTPUT_DEBUG = $(call TOOL_LLVMGXX42MACHO_DEBUG_BUNDLE_FN,$(out))
    420 TOOL_LLVMGXX42MACHO_LINK_PROGRAM_DEBUG_INSTALL_FN = $(TOOL_LLVMGXX42MACHO_DEBUG_INSTALL_FN)
    421 TOOL_LLVMGXX42MACHO_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    422 TOOL_LLVMGXX42MACHO_LINK_PROGRAM_DEPORD =
    423 define TOOL_LLVMGXX42MACHO_LINK_PROGRAM_CMDS
     429TOOL_CLANGXXMACHO_LINK_PROGRAM_OUTPUT = $(outbase).rsp
     430TOOL_CLANGXXMACHO_LINK_PROGRAM_OUTPUT_DEBUG = $(call TOOL_CLANGXXMACHO_DEBUG_BUNDLE_FN,$(out))
     431TOOL_CLANGXXMACHO_LINK_PROGRAM_DEBUG_INSTALL_FN = $(TOOL_CLANGXXMACHO_DEBUG_INSTALL_FN)
     432TOOL_CLANGXXMACHO_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     433TOOL_CLANGXXMACHO_LINK_PROGRAM_DEPORD =
     434define TOOL_CLANGXXMACHO_LINK_PROGRAM_CMDS
    424435        $(QUIET)$(APPEND) -n $(outbase).rsp $(filter-out %.h.gch,$(objs))
    425         $(QUIET)$(TOOL_LLVMGXX42MACHO_LD) $(flags) -o $(out)\
     436        $(QUIET)$(TOOL_CLANGXXMACHO_LD) $(flags) -o $(out)\
    426437                -filelist $(outbase).rsp\
    427438                $(foreach p,$(libpath), -L$(p))\
    428439                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
    429440 ifeq ($(ld_debug),split)
    430         $(QUIET)$(TOOL_LLVMGXX42MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
    431         $(QUIET)$(TOOL_LLVMGXX42MACHO_STRIP_PROGRAM) $(out)
     441        $(QUIET)$(TOOL_CLANGXXMACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
     442        $(QUIET)$(TOOL_CLANGXXMACHO_STRIP_PROGRAM) $(out)
    432443 endif
    433444endef
    … …  
    436447## Link DLL
    437448# @param    $(target)   Normalized main target name.
    438 # @param    $(out)              Program name.
     449# @param    $(out)      Program name.
    439450# @param    $(objs)     Object files to link together.
    440451# @param    $(libs)     Libraries to search.
    … …  
    442453# @param    $(flags)    Flags.
    443454# @param    $(dirdep)   Directory creation dependency.
    444 # @param    $(deps)             Other dependencies.
     455# @param    $(deps)     Other dependencies.
    445456# @param    $(othersrc) Unhandled sources.
    446457# @param    $(custom_pre)   Custom step invoked before linking.
    447458# @param    $(custom_post)  Custom step invoked after linking.
    448459# @param    $(outbase)  Output basename (full). Use this for list files and such.
    449 TOOL_LLVMGXX42MACHO_LINK_DLL_OUTPUT = $(outbase).rsp
    450 TOOL_LLVMGXX42MACHO_LINK_DLL_OUTPUT_DEBUG = $(call TOOL_LLVMGXX42MACHO_DEBUG_BUNDLE_FN,$(out))
    451 TOOL_LLVMGXX42MACHO_LINK_DLL_DEBUG_INSTALL_FN = $(TOOL_LLVMGXX42MACHO_DEBUG_INSTALL_FN)
    452 TOOL_LLVMGXX42MACHO_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    453 TOOL_LLVMGXX42MACHO_LINK_DLL_DEPORD =
    454 define TOOL_LLVMGXX42MACHO_LINK_DLL_CMDS
     460TOOL_CLANGXXMACHO_LINK_DLL_OUTPUT = $(outbase).rsp
     461TOOL_CLANGXXMACHO_LINK_DLL_OUTPUT_DEBUG = $(call TOOL_CLANGXXMACHO_DEBUG_BUNDLE_FN,$(out))
     462TOOL_CLANGXXMACHO_LINK_DLL_DEBUG_INSTALL_FN = $(TOOL_CLANGXXMACHO_DEBUG_INSTALL_FN)
     463TOOL_CLANGXXMACHO_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     464TOOL_CLANGXXMACHO_LINK_DLL_DEPORD =
     465define TOOL_CLANGXXMACHO_LINK_DLL_CMDS
    455466        $(QUIET)$(APPEND) -n $(outbase).rsp $(filter-out %.h.gch,$(objs))
    456         $(QUIET)$(TOOL_LLVMGXX42MACHO_LD) $(TOOL_LLVMGXX42MACHO_LDFLAGS.dll) $(flags) -o $(out)\
    457                 $(call TOOL_LLVMGXX42MACHO_LD_SONAME,$(target),$(out))\
     467        $(QUIET)$(TOOL_CLANGXXMACHO_LD) $(TOOL_CLANGXXMACHO_LDFLAGS.dll) $(flags) -o $(out)\
     468                $(call TOOL_CLANGXXMACHO_LD_SONAME,$(target),$(out))\
    458469                -filelist $(outbase).rsp\
    459470                $(foreach p,$(libpath), -L$(p))\
    460471                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
    461472 ifeq ($(ld_debug),split)
    462         $(QUIET)$(TOOL_LLVMGXX42MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
    463         $(QUIET)$(TOOL_LLVMGXX42MACHO_STRIP_DLL) $(out)
     473        $(QUIET)$(TOOL_CLANGXXMACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
     474        $(QUIET)$(TOOL_CLANGXXMACHO_STRIP_DLL) $(out)
    464475 endif
    465476endef
    … …  
    468479## Link system module (windows aka driver, linux aka kernel module)
    469480# @param    $(target)   Normalized main target name.
    470 # @param    $(out)              System module name.
     481# @param    $(out)      System module name.
    471482# @param    $(objs)     Object files to link together.
    472483# @param    $(libs)     Libraries to search.
    … …  
    474485# @param    $(flags)    Flags.
    475486# @param    $(dirdep)   Directory creation dependency.
    476 # @param    $(deps)             Other dependencies.
     487# @param    $(deps)     Other dependencies.
    477488# @param    $(othersrc) Unhandled sources.
    478489# @param    $(custom_pre)   Custom step invoked before linking.
    479490# @param    $(custom_post)  Custom step invoked after linking.
    480491# @param    $(outbase)  Output basename (full). Use this for list files and such.
    481 TOOL_LLVMGXX42MACHO_LINK_SYSMOD_OUTPUT = $(outbase).rsp
    482 TOOL_LLVMGXX42MACHO_LINK_SYSMOD_OUTPUT_DEBUG = $(call TOOL_LLVMGXX42MACHO_DEBUG_BUNDLE_FN,$(out))
    483 TOOL_LLVMGXX42MACHO_LINK_SYSMOD_DEBUG_INSTALL_FN = $(TOOL_LLVMGXX42MACHO_DEBUG_INSTALL_FN)
    484 TOOL_LLVMGXX42MACHO_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    485 TOOL_LLVMGXX42MACHO_LINK_SYSMOD_DEPORD =
    486 define TOOL_LLVMGXX42MACHO_LINK_SYSMOD_CMDS
     492TOOL_CLANGXXMACHO_LINK_SYSMOD_OUTPUT = $(outbase).rsp
     493TOOL_CLANGXXMACHO_LINK_SYSMOD_OUTPUT_DEBUG = $(call TOOL_CLANGXXMACHO_DEBUG_BUNDLE_FN,$(out))
     494TOOL_CLANGXXMACHO_LINK_SYSMOD_DEBUG_INSTALL_FN = $(TOOL_CLANGXXMACHO_DEBUG_INSTALL_FN)
     495TOOL_CLANGXXMACHO_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     496TOOL_CLANGXXMACHO_LINK_SYSMOD_DEPORD =
     497define TOOL_CLANGXXMACHO_LINK_SYSMOD_CMDS
    487498        $(QUIET)$(APPEND) -n $(outbase).rsp $(filter-out %.h.gch,$(objs))
    488         $(QUIET)$(TOOL_LLVMGXX42MACHO_LD_SYSMOD) $(TOOL_LLVMGXX42MACHO_LDFLAGS.sysmod) $(flags) -o $(out)\
     499        $(QUIET)$(TOOL_CLANGXXMACHO_LD_SYSMOD) $(TOOL_CLANGXXMACHO_LDFLAGS.sysmod) $(flags) -o $(out)\
    489500                -filelist $(outbase).rsp\
    490501                $(foreach p,$(libpath), -L$(p))\
    491502                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
    492503 ifeq ($(ld_debug),split)
    493         $(QUIET)$(TOOL_LLVMGXX42MACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
    494         $(QUIET)$(TOOL_LLVMGXX42MACHO_STRIP_SYSMOD) $(out)
     504        $(QUIET)$(TOOL_CLANGXXMACHO_DSYMUTIL) -o $(out).dSYM/ $(out)
     505        $(QUIET)$(TOOL_CLANGXXMACHO_STRIP_SYSMOD) $(out)
    495506 endif
    496507endef
Note: See TracChangeset for help on using the changeset viewer.