Changeset 21795 for branches


Ignore:
Timestamp:
Nov 7, 2011, 10:59:23 PM (14 years ago)
Author:
dmik
Message:

Make sure ImpDef and WineRC tools are built before they are used.

This is done by making them dependencies for .exp.def and binary
resource files respectively. These dependencies are vital in parallel builds.

Location:
branches/gcc-kmk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/Config.kmk

    r21794 r21795  
    3333    $(target)_imp_TEMPLATE = OdinCxx
    3434    $(target)_imp_NAME     = $(target)
    35     $$$$($(target)_imp_0_OUTDIR)/$(def_exp): $(def) | $$$$(dir $$$$@)
     35    $$$$($(target)_imp_0_OUTDIR)/$(def_exp): $(def) $$(PATH_STAGE_BIN)/impdef.exe | $$$$(dir $$$$@)
    3636                %$$(call MSG_TOOL,impdef,$(target)_imp,$(abspath $$<),$$@)
    37                 $(QUIET2)$$(PATH_STAGE_BIN)/impdef $$< $$@
     37                $(QUIET2)$$(PATH_STAGE_BIN)/impdef.exe $$< $$@
    3838ifeq ($(def_exp_debug),)
    3939 ifeq ($(no_def_exp),)
    … …  
    111111TOOL_GXX3OMF_WRCOBJSUFF         = $(TOOL_GXX3OMF_COBJSUFF)
    112112TOOL_GXX3OMF_COMPILE_WRC_OUTPUT = $(outbase).orc.s
    113 TOOL_GXX3OMF_COMPILE_WRC_DEPEND =
     113TOOL_GXX3OMF_COMPILE_WRC_DEPEND = $(TOOL_GXX3OMF_WRC)
    114114TOOL_GXX3OMF_COMPILE_WRC_DEPORD =
    115115define TOOL_GXX3OMF_COMPILE_WRC_CMDS

  • branches/gcc-kmk/tools/Makefile.kmk

    r21759 r21795  
    1010#
    1111include $(PATH_SUB_CURRENT)/common/Makefile.kmk
     12include $(PATH_SUB_CURRENT)/impdef/Makefile.kmk
    1213include $(PATH_SUB_CURRENT)/wrc/Makefile.kmk
    1314

  • branches/gcc-kmk/tools/impdef/Makefile.kmk

    r21763 r21795  
    66include $(KBUILD_PATH)/subheader.kmk
    77
    8 PROGRAMS           += impdef
     8BLDPROGS           += impdef
    99impdef_TEMPLATE     = OdinCxx
     10
     11# @todo: the need of this for BLDPROGS looks like a kBuild bug to me
     12impdef_INST         = bin/
     13impdef_INSTTYPE     = stage
    1014
    1115impdef_INCS         = \

  • branches/gcc-kmk/tools/wrc/Makefile.kmk

    r21764 r21795  
    1212# name it winerc to avoid the naming conflict with Watcom RC
    1313
    14 PROGRAMS           += winerc
     14BLDPROGS           += winerc
    1515winerc_TEMPLATE     = OdinCxx
     16
     17# @todo: the need of this for BLDPROGS looks like a kBuild bug to me
     18winerc_INST         = bin/
     19winerc_INSTTYPE     = stage
    1620
    1721winerc_SOURCES      = \
Note: See TracChangeset for help on using the changeset viewer.