Changeset 2731 for trunk


Ignore:
Timestamp:
Jun 28, 2014, 4:58:12 PM (11 years ago)
Author:
bird
Message:

wcl and wcl386 doodoos in the current directory which causes trouble for parallel execution of them.

Location:
trunk/kBuild/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r2572 r2731  
    113113TOOL_OPENWATCOM-16_LINK_PROGRAM_DEPORD =
    114114define TOOL_OPENWATCOM-16_LINK_PROGRAM_CMDS
    115         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     115        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(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)))) \
     135        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(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)))) \
     155        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    156156                $(TOOL_OPENWATCOM_LD16) \
    157157                $(flags) \

  • trunk/kBuild/tools/OPENWATCOM.kmk

    r2726 r2731  
    6767        -E 'LIB=$1' \
    6868        -E 'INCLUDE=' \
    69         --
     69        $2 --
    7070 else ifeq ($(KBUILD_HOST),freebsd)
    7171  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binfbsd
    … …  
    7676        -E 'LIB=$1' \
    7777        -E 'INCLUDE=' \
    78         --
     78        $2 --
    7979 else ifeq ($(KBUILD_HOST),linux)
    8080  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binl
    … …  
    8585        -E 'LIB=$1' \
    8686        -E 'INCLUDE=' \
    87         --
     87        $2 --
    8888 else ifeq ($(KBUILD_HOST),os2)
    8989  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binp
    … …  
    9696        -E 'LIB=$1' \
    9797        -E 'INCLUDE=' \
    98         --
     98        $2 --
    9999 else ifeq ($(KBUILD_HOST),solaris)
    100100  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binsol
    … …  
    105105        -E 'LIB=$1' \
    106106        -E 'INCLUDE=' \
    107         --
     107        $2 --
    108108 else
    109109  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binnt
    … …  
    114114        -E 'LIB=$1' \
    115115        -E 'INCLUDE=' \
    116         --
     116        $2 --
    117117 endif
    118118
    … …  
    134134        -E 'LIB=$1' \
    135135        -E 'INCLUDE=' \
    136         --
     136        $2 --
    137137 TOOL_OPENWATCOM_CC    ?= wcc386$(HOSTSUFF_EXE)
    138138 TOOL_OPENWATCOM_CC16  ?= wcc$(HOSTSUFF_EXE)
    … …  
    270270TOOL_OPENWATCOM_LINK_PROGRAM_DEPORD =
    271271define TOOL_OPENWATCOM_LINK_PROGRAM_CMDS
    272         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     272        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    273273                $(TOOL_OPENWATCOM_LD) \
    274274                $(flags) \
    … …  
    289289TOOL_OPENWATCOM_LINK_DLL_DEPORD =
    290290define TOOL_OPENWATCOM_LINK_DLL_CMDS
    291         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     291        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    292292                $(TOOL_OPENWATCOM_LD) \
    293293                $(flags) \
    … …  
    308308TOOL_OPENWATCOM_LINK_SYSMOD_DEPORD =
    309309define TOOL_OPENWATCOM_LINK_SYSMOD_CMDS
    310         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     310        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    311311                $(TOOL_OPENWATCOM_LD) \
    312312                $(flags) \

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

    r2413 r2731  
    9696TOOL_WATCOMC11C-16_LINK_PROGRAM_DEPORD =
    9797define TOOL_WATCOMC11C-16_LINK_PROGRAM_CMDS
    98         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     98        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(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)))) \
     117        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(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)))) \
     136        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    137137                $(TOOL_WATCOMC11C_LD16) \
    138138                $(flags) \

  • trunk/kBuild/tools/WATCOMC11C.kmk

    r2726 r2731  
    7070        -E 'LIB=$1' \
    7171        -E 'INCLUDE=' \
    72         --
     72        $2 --
    7373 else
    7474  PATH_TOOL_WATCOMC11C_BIN   = $(PATH_TOOL_WATCOMC11C)/binnt
    … …  
    8080        -E 'LIB=$1' \
    8181        -E 'INCLUDE=' \
    82         --
     82        $2 --
    8383 endif
    8484
    … …  
    100100        -E 'LIB=$1' \
    101101        -E 'INCLUDE=' \
    102         --
     102        $2 --
    103103 TOOL_WATCOMC11C_CC    ?= wcc386$(HOSTSUFF_EXE)
    104104 TOOL_WATCOMC11C_CC16  ?= wcc$(HOSTSUFF_EXE)
    … …  
    203203TOOL_WATCOMC11C_LINK_PROGRAM_DEPORD =
    204204define TOOL_WATCOMC11C_LINK_PROGRAM_CMDS
    205         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     205        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    206206                $(TOOL_WATCOMC11C_LD) \
    207207                $(flags) \
    … …  
    222222TOOL_WATCOMC11C_LINK_DLL_DEPORD =
    223223define TOOL_WATCOMC11C_LINK_DLL_CMDS
    224         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     224        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    225225                $(TOOL_WATCOMC11C_LD) \
    226226                $(flags) \
    … …  
    241241TOOL_WATCOMC11C_LINK_SYSMOD_DEPORD =
    242242define TOOL_WATCOMC11C_LINK_SYSMOD_CMDS
    243         $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath)))) \
     243        $(QUIET)$(call TOOL_WATCOMC11C_ENV_SETUP,$(subst $(SP),,$(addsuffix ;,$(libpath))),-C $(dir $(out))) \
    244244                $(TOOL_WATCOMC11C_LD) \
    245245                $(flags) \
Note: See TracChangeset for help on using the changeset viewer.