Changeset 2749


Ignore:
Timestamp:
Jan 23, 2015, 2:01:02 AM (10 years ago)
Author:
bird
Message:

tools/*WATCOM*: Pass --wcc-brain-damange to REDIRECT where appropriate.

Location:
trunk/kBuild/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/OPENWATCOM-16.kmk

    r2731 r2749  
    4646TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT = $(obj).err
    4747define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS
    48         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AS) \
     48        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \
    4949                $(flags) \
    5050                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    … …  
    6161TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT = $(obj).err
    6262define TOOL_OPENWATCOM-16_COMPILE_C_CMDS
    63         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC16) \
     63        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC16) \
    6464                $(flags) \
    6565                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    … …  
    7676TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT = $(obj).err
    7777define TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS
    78         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CXX16) \
     78        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX16) \
    7979                $(flags) \
    8080                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    … …  
    105105define TOOL_OPENWATCOM-16_LINK_LIBRARY_CMDS
    106106        $(QUIET)$(APPEND) -tn $(outbase).rsp $(foreach obj,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(objs) $(othersrc)),'+"$(obj)"')
    107         $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AR) $(flags) $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) @$(outbase).rsp
     107        $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AR) $(flags) $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) @$(outbase).rsp
    108108endef
    109109
    … …  
    113113TOOL_OPENWATCOM-16_LINK_PROGRAM_DEPORD =
    114114define TOOL_OPENWATCOM-16_LINK_PROGRAM_CMDS
    115         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     115        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    116116                $(TOOL_OPENWATCOM_LD16) \
    117117                $(flags) \
    … …  
    133133TOOL_OPENWATCOM-16_LINK_DLL_DEPORD =
    134134define TOOL_OPENWATCOM-16_LINK_DLL_CMDS
    135         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     135        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    136136                $(TOOL_OPENWATCOM_LD16) \
    137137                $(flags) \
    … …  
    153153TOOL_OPENWATCOM-16_LINK_SYSMOD_DEPORD =
    154154define TOOL_OPENWATCOM-16_LINK_SYSMOD_CMDS
    155         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     155        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    156156                $(TOOL_OPENWATCOM_LD16) \
    157157                $(flags) \

  • trunk/kBuild/tools/OPENWATCOM-WL.kmk

    r2663 r2749  
    5555                $(foreach o,$(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
    5656                $(foreach l,$(call TOOL_OPENWATCOM_FIX_SLASHES_SQ,$(libs)),'Library $l')
    57         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
     57        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) \
    5858                $(TOOL_OPENWATCOM_WLINK) @$(outbase).rsp
    5959        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \

  • trunk/kBuild/tools/OPENWATCOM.kmk

    r2732 r2749  
    148148endif
    149149
     150if $(KBUILD_KMK_REVISION) >= 2747
     151 TOOL_OPENWATCOM_ENV_SETUP_BD ?= $(call TOOL_OPENWATCOM_ENV_SETUP,$1,$2 --wcc-brain-damage)
     152else
     153 TOOL_OPENWATCOM_ENV_SETUP_BD ?= $(call TOOL_OPENWATCOM_ENV_SETUP,$1,$2)
     154endif
     155
     156
    150157# Functions for changing slashes (SQ = single quoted).
    151158if1of ($(KBUILD_HOST), os2 win)
    … …  
    203210TOOL_OPENWATCOM_COMPILE_AS_OUTPUT = $(obj).err
    204211define TOOL_OPENWATCOM_COMPILE_AS_CMDS
    205         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AS) \
     212        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \
    206213                $(flags) \
    207214                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    … …  
    219226TOOL_OPENWATCOM_COMPILE_C_OUTPUT = $(obj).err
    220227define TOOL_OPENWATCOM_COMPILE_C_CMDS
    221         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CC) \
     228        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC) \
    222229                $(flags) \
    223230                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    … …  
    234241TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT = $(obj).err
    235242define TOOL_OPENWATCOM_COMPILE_CXX_CMDS
    236         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_CXX) \
     243        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX) \
    237244                $(flags) \
    238245                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
    … …  
    273280               --append $(outbase).rsp \
    274281        )
    275         $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AR) $(flags) $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) @$(outbase).rsp
     282        $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AR) $(flags) $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) @$(outbase).rsp
    276283endef
    277284
    … …  
    280287TOOL_OPENWATCOM_LINK_PROGRAM_DEPORD =
    281288define TOOL_OPENWATCOM_LINK_PROGRAM_CMDS
    282         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     289        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    283290                $(TOOL_OPENWATCOM_LD) \
    284291                $(flags) \
    … …  
    299306TOOL_OPENWATCOM_LINK_DLL_DEPORD =
    300307define TOOL_OPENWATCOM_LINK_DLL_CMDS
    301         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     308        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    302309                $(TOOL_OPENWATCOM_LD) \
    303310                $(flags) \
    … …  
    318325TOOL_OPENWATCOM_LINK_SYSMOD_DEPORD =
    319326define TOOL_OPENWATCOM_LINK_SYSMOD_CMDS
    320         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     327        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    321328                $(TOOL_OPENWATCOM_LD) \
    322329                $(flags) \

  • trunk/kBuild/tools/WATCOMC11C-16.kmk

    r2731 r2749  
    4545TOOL_WATCOMC11C-16_COMPILE_C_OUTPUT = $(obj).err
    4646define TOOL_WATCOMC11C-16_COMPILE_C_CMDS
    47         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CC16) \
     47        $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP_BD) $(TOOL_WATCOMC11C_CC16) \
    4848                $(flags) \
    4949                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    6060TOOL_WATCOMC11C-16_COMPILE_CXX_OUTPUT = $(obj).err
    6161define TOOL_WATCOMC11C-16_COMPILE_CXX_CMDS
    62         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CXX16) \
     62        $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP_BD) $(TOOL_WATCOMC11C_CXX16) \
    6363                $(flags) \
    6464                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    8989define TOOL_WATCOMC11C-16_LINK_LIBRARY_CMDS
    9090        $(QUIET)$(APPEND) -tn $(outbase).rsp $(foreach obj,$(subst /,\,$(objs) $(othersrc)),'+"$(obj)"')
    91         $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_AR) $(flags) $(subst /,\\,$(out)) @$(outbase).rsp
     91        $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP_BD) $(TOOL_WATCOMC11C_AR) $(flags) $(subst /,\\,$(out)) @$(outbase).rsp
    9292endef
    9393
    … …  
    9696TOOL_WATCOMC11C-16_LINK_PROGRAM_DEPORD =
    9797define TOOL_WATCOMC11C-16_LINK_PROGRAM_CMDS
    98         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     98        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    9999                $(TOOL_WATCOMC11C_LD16) \
    100100                $(flags) \
    … …  
    115115TOOL_WATCOMC11C-16_LINK_DLL_DEPORD =
    116116define TOOL_WATCOMC11C-16_LINK_DLL_CMDS
    117         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     117        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    118118                $(TOOL_WATCOMC11C_LD16) \
    119119                $(flags) \
    … …  
    134134TOOL_WATCOMC11C-16_LINK_SYSMOD_DEPORD =
    135135define TOOL_WATCOMC11C-16_LINK_SYSMOD_CMDS
    136         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     136        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    137137                $(TOOL_WATCOMC11C_LD16) \
    138138                $(flags) \

  • trunk/kBuild/tools/WATCOMC11C-WL.kmk

    r2413 r2749  
    5454        $(foreach o,$(subst /,\,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
    5555                $(foreach l,$(subst /,\,$(libs)),'Library $l')
    56         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \
     56        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD) \
    5757                $(TOOL_WATCOMC11C_WLINK) @$(outbase).rsp
    5858        $(if $(filter %.res,$(objs)), $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP) \

  • trunk/kBuild/tools/WATCOMC11C.kmk

    r2731 r2749  
    114114endif
    115115
     116if $(KBUILD_KMK_REVISION) >= 2747
     117 TOOL_WATCOMC11C_ENV_SETUP_BD ?= $(call TOOL_WATCOMC11C_ENV_SETUP,$1,$2 --wcc-brain-damage)
     118else
     119 TOOL_WATCOMC11C_ENV_SETUP_BD ?= $(call TOOL_WATCOMC11C_ENV_SETUP,$1,$2)
     120endif
     121
     122
    116123# General Properties used by kBuild
    117124TOOL_WATCOMC11C_COBJSUFF         ?= .obj
    … …  
    152159TOOL_WATCOMC11C_COMPILE_C_OUTPUT = $(obj).err
    153160define TOOL_WATCOMC11C_COMPILE_C_CMDS
    154         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CC) \
     161        $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP_BD) $(TOOL_WATCOMC11C_CC) \
    155162                $(flags) \
    156163                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    167174TOOL_WATCOMC11C_COMPILE_CXX_OUTPUT = $(obj).err
    168175define TOOL_WATCOMC11C_COMPILE_CXX_CMDS
    169         $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_CXX) \
     176        $(QUIET) $(call TOOL_WATCOMC11C_ENV_SETUP_BD) $(TOOL_WATCOMC11C_CXX) \
    170177                $(flags) \
    171178                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
    … …  
    196203define TOOL_WATCOMC11C_LINK_LIBRARY_CMDS
    197204        $(QUIET)$(APPEND) -tn $(outbase).rsp $(foreach obj,$(subst /,\,$(objs) $(othersrc)),'+"$(obj)"')
    198         $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP) $(TOOL_WATCOMC11C_AR) $(flags) $(subst /,\\,$(out)) @$(outbase).rsp
     205        $(QUIET)$(TOOL_WATCOMC11C_ENV_SETUP_BD) $(TOOL_WATCOMC11C_AR) $(flags) $(subst /,\\,$(out)) @$(outbase).rsp
    199206endef
    200207
    … …  
    203210TOOL_WATCOMC11C_LINK_PROGRAM_DEPORD =
    204211define TOOL_WATCOMC11C_LINK_PROGRAM_CMDS
    205         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     212        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    206213                $(TOOL_WATCOMC11C_LD) \
    207214                $(flags) \
    … …  
    222229TOOL_WATCOMC11C_LINK_DLL_DEPORD =
    223230define TOOL_WATCOMC11C_LINK_DLL_CMDS
    224         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     231        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    225232                $(TOOL_WATCOMC11C_LD) \
    226233                $(flags) \
    … …  
    241248TOOL_WATCOMC11C_LINK_SYSMOD_DEPORD =
    242249define TOOL_WATCOMC11C_LINK_SYSMOD_CMDS
    243         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
     250        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP_BD,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    244251                $(TOOL_WATCOMC11C_LD) \
    245252                $(flags) \
Note: See TracChangeset for help on using the changeset viewer.