Changeset 725


Ignore:
Timestamp:
Dec 15, 2006, 6:18:47 AM (19 years ago)
Author:
bird
Message:

Partial implementation of a _PATH target property for resolving relative paths. It's primarily intended for sub-makefile mode where we apply it to all targets automatically. TODOs: INCS, DEPs (source level) and SUBDIRS*.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/footer.kmk

    r723 r725  
    185185no-root-slash=$(patsubst /%,%,$(1))
    186186
     187ifneq ($(filter abspathex,$(KMK_FEATURES)),abspathex) ## @todo Retire this to gnumake-header.kmk when it has been implemented.
     188## Converts an relative path to an absolute path using the given CWD.
     189# @returns absolute path.
     190# @param    $1      The path to fixup.
     191# @param    $2      The CWD to use.
     192abspathex = $(foreach _fix_path,$1\
     193,$(if $(subst :$(call no-root-slash,$(call no-drive,$(_fix_path))):,,:$(_fix_path):),$(_fix_path),$(abspath $2/$(_fix_path))))
     194endif
     195
    187196## Figure out where to put object files.
    188197# @param    $1      source file
    … …  
    11271136## Generic macro for processing all target sources.
    11281137# @param    $(target)   Normalized target name.
     1138# @param    $(defpath)
     1139# @param    much-more...
    11291140define def_target_sources
     1141
     1142# Apply any default path on the sources first.
     1143ifneq ($(defpath),)
     1144 ifdef $(target)_SOURCES
     1145  $(target)_SOURCES := $(call abspathex,$($(target)_SOURCES),$(defpath))
     1146 endif
     1147 ifdef $(target)_SOURCES.$(bld_trg)
     1148  $(target)_SOURCES.$(bld_trg) := $(call abspathex,$($(target)_SOURCES.$(bld_trg)),$(defpath))
     1149 endif
     1150 ifdef $(target)_SOURCES.$(bld_trg).$(bld_trg_arch)
     1151  $(target)_SOURCES.$(bld_trg).$(bld_trg_arch) := $(call abspathex,$($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)),$(defpath))
     1152 endif
     1153 ifdef $(target)_SOURCES.$(bld_trg_arch)
     1154  $(target)_SOURCES.$(bld_trg_arch) := $(call abspathex,$($(target)_SOURCES.$(bld_trg_arch)),$(defpath))
     1155 endif
     1156 ifdef $(target)_SOURCES.$(bld_trg_cpu)
     1157  $(target)_SOURCES.$(bld_trg_cpu) := $(call abspathex,$($(target)_SOURCES.$(bld_trg_cpu)),$(defpath))
     1158 endif
     1159 ifdef $(target)_SOURCES.$(bld_type)
     1160  $(target)_SOURCES.$(bld_type) := $(call abspathex,$($(target)_SOURCES.$(bld_type)),$(defpath))
     1161 endif
     1162endif
     1163
    11301164#$ (warning def_target_sources)
    11311165# C sources
    … …  
    12171251TARGET_$(target) := $(out)
    12181252$(target)_OBJS_ :=
     1253defpath := $($(target)_PATH)
    12191254
    12201255# source -> object
    … …  
    12541289deps        := $($(target)_DEPS)
    12551290
     1291# Adjust paths if we got a default path.
     1292ifneq ($(defpath),)
     1293 objs := $(call abspathex,$(objs),$(defpath))
     1294 deps := $(call abspathex,$(deps),$(defpath))
     1295endif
     1296
    12561297# dependency file
    12571298dep := $(out)$(SUFF_DEP)
    … …  
    13281369TARGET_$(target) := $(out)
    13291370$(target)_OBJS_  :=
     1371defpath := $($(target)_PATH)
    13301372
    13311373# source -> object
    … …  
    14551497deps        := $($(target)_DEPS)
    14561498
     1499# Adjust paths if we got a default path.
     1500ifneq ($(defpath),)
     1501 libpath := $(call abspathex,$(libpath)def $(target)_PATH)
     1502 objs := $(call abspathex,$(objs),$(defpath))
     1503 deps := $(call abspathex,$(deps),$(defpath))
     1504 # libs are not subject to this because of the the -l<lib> stuff. Use $(<target>_PATH)/lib if relative to current dir!
     1505endif
     1506
    14571507## @todo this stuff can't be working.
    14581508custom_pre  := $(strip $(firstword \
    … …  
    16621712# _INSTFUN
    16631713ifdef $(srcsrc)_INSTFUN
    1664 instfun := $(srcsrc)_INSTFUN
     1714 instfun := $(srcsrc)_INSTFUN
    16651715else
    1666 ifdef $(target)_INSTFUN
    1667 instfun := $(target)_INSTFUN
    1668 else
    1669 instfun := _INSTALL_FILE
    1670 endif
     1716 ifdef $(target)_INSTFUN
     1717  instfun := $(target)_INSTFUN
     1718 else
     1719  instfun := _INSTALL_FILE
     1720 endif
    16711721endif
    16721722
    16731723# _INST
    16741724ifdef $(srcsrc)_INST
    1675 inst := $(patsubst %/,%,$($(srcsrc)_INST))/$(dir $(srcdstdir))
     1725 inst := $(patsubst %/,%,$($(srcsrc)_INST))/$(dir $(srcdstdir))
    16761726else
    1677 ifdef $(target)_INST
    1678 inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(srcdstdir))
    1679 else
    1680 inst := $(dir $(srcdstdir))
    1681 endif
     1727 ifdef $(target)_INST
     1728  inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(srcdstdir))
     1729 else
     1730  inst := $(dir $(srcdstdir))
     1731 endif
    16821732endif
    16831733
    … …  
    17361786        $($(target)_GID))
    17371787
     1788
     1789# Adjust the source if we got a default PATH. (This must be done this late!)
     1790ifdef $(target)_PATH
     1791 srcsrc := $(call abspathex,$(srcsrc),$($(target)_PATH))
     1792endif
     1793
    17381794# create the command
    17391795ifdef $(srcsrc)_INSTALLER
    1740 inscmd := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(insdst),$(target))
     1796 inscmd := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(insdst),$(target))
    17411797else
    1742 ifdef $(target)_INSTALLER
    1743 inscmd := $(call $(target)_INSTALLER,$(srcsrc),$(insdst),$(target))
    1744 else
    1745 inscmd := $$(INSTALL)\
     1798 ifdef $(target)_INSTALLER
     1799  inscmd := $(call $(target)_INSTALLER,$(srcsrc),$(insdst),$(target))
     1800 else
     1801  inscmd := $$(INSTALL)\
    17461802                $(if $(uid),-o $(uid))\
    17471803                $(if $(gid),-g $(gid))\
    17481804                $(if $(mode),-m $(mode))\
    17491805                $(srcsrc) $(insdst)
    1750 endif
     1806 endif
    17511807endif
    17521808
    … …  
    17881844# _INST
    17891845ifdef $(symlnk)_INST
    1790 inst := $(patsubst %/,%,$($(symlnk)_INST))/$(dir $(symlnk))
     1846 inst := $(patsubst %/,%,$($(symlnk)_INST))/$(dir $(symlnk))
    17911847else
    1792 ifdef $(target)_INST
    1793 inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(symlnk))
    1794 else
    1795 inst := $(dir $(symlnk))
    1796 endif
     1848 ifdef $(target)_INST
     1849  inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(symlnk))
     1850 else
     1851  inst := $(dir $(symlnk))
     1852 endif
    17971853endif
    17981854
    … …  
    18281884# _INST
    18291885ifdef $(directory)_INST
    1830 inst := $(PATH_INS)/$(patsubst %/,%,$($(directory)_INST))
     1886 inst := $(PATH_INS)/$(patsubst %/,%,$($(directory)_INST))
    18311887else
    1832 ifdef $(target)_INST
    1833 inst := $(PATH_INS)/$(patsubst %/,%,$($(target)_INST))
    1834 else
    1835 inst := $(PATH_INS)
    1836 endif
     1888 ifdef $(target)_INST
     1889  inst := $(PATH_INS)/$(patsubst %/,%,$($(target)_INST))
     1890 else
     1891  inst := $(PATH_INS)
     1892 endif
    18371893endif
    18381894
    … …  
    21422198endif # __footer_kmk__
    21432199
     2200

  • trunk/kBuild/header.kmk

    r724 r725  
    156156# Common definitions.
    157157#
     158## PATH_CURRENT is the current directory (getcwd).
    158159PATH_CURRENT        := $(abspath $(CURDIR))
     160## PATH_SUB_CURRENT points to current directory of the current makefile.
     161# Meaning that it will change value as we enter and exit sub-makefiles.
     162PATH_SUB_CURRENT    := $(PATH_CURRENT)
     163## PATH_ROOT points to the project root directory.
     164PATH_ROOT           := $(abspath $(PATH_CURRENT)/$(DEPTH))
     165## PATH_SUB_ROOT points to the directory of the top-level makefile.
    159166ifneq ($(strip $(SUB_DEPTH)),)
    160 PATH_SUB_CURRENT    := $(abspath $(PATH_CURRENT)/$(SUB_DEPTH))
    161 else
    162 PATH_SUB_CURRENT    := $(PATH_CURRENT)
    163 endif
    164 PATH_ROOT           := $(abspath $(PATH_CURRENT)/$(DEPTH))
    165 
    166 # Subdirectory relative to the root.
     167 PATH_SUB_ROOT      := $(abspath $(PATH_CURRENT)/$(SUB_DEPTH))
     168else
     169 PATH_SUB_ROOT      := $(PATH_CURRENT)
     170endif
     171
     172## CURSUBDIR is PATH_SUB_ROOT described relative to PATH_ROOT.
     173# This variable is used to determin where the object files and other output goes.
    167174ifneq ($(PATH_ROOT),$(PATH_CURRENT))
    168 CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_SUB_CURRENT))
     175CURSUBDIR           := $(patsubst $(PATH_ROOT)/%,%,$(PATH_SUB_ROOT))
    169176else
    170177CURSUBDIR           := .
    … …  
    173180# Output directories.
    174181ifndef PATH_OUT_BASE
    175 PATH_OUT_BASE       := $(PATH_ROOT)/out
     182 PATH_OUT_BASE      := $(PATH_ROOT)/out
    176183endif
    177184ifndef PATH_OUT
    178 ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places.)
    179 PATH_OUT            := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH).$(BUILD_TARGET_SUB)/$(BUILD_TYPE)
    180 else
    181 PATH_OUT            := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)
    182 endif
     185 ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places.)
     186  PATH_OUT          := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH).$(BUILD_TARGET_SUB)/$(BUILD_TYPE)
     187 else
     188  PATH_OUT          := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)
     189 endif
    183190endif # !define PATH_OUT
    184191PATH_OBJ             = $(PATH_OUT)/obj
    … …  
    193200# Usually kBuild is external to the source tree.
    194201ifndef PATH_KBUILD
    195 PATH_KBUILD         := $(PATH_ROOT)/kBuild
     202 PATH_KBUILD        := $(PATH_ROOT)/kBuild
    196203endif
    197204PATH_KBUILD         := $(abspath $(PATH_KBUILD))
    198205# kBuild files which might be of interest.
    199206FILE_KBUILD_HEADER  := $(PATH_KBUILD)/header.kmk
    200 FILE_KBUILD_CONFIG  := $(PATH_KBUILD)/config.kmk
     207#FILE_KBUILD_CONFIG  := $(PATH_KBUILD)/config.kmk
    201208FILE_KBUILD_FOOTER  := $(PATH_KBUILD)/footer.kmk
    202209
    203210SUFF_DEP            := .dep
     211## MAKEFILE is the name of the main makefile.
    204212MAKEFILE            := $(firstword $(MAKEFILE_LIST))
     213## MAKEFILE_CURRENT is the name of the current makefile.
     214# This is updated everything a sub-makefile is included.
     215MAKEFILE_CURRENT    := $(MAKEFILE)
    205216
    206217

  • trunk/kBuild/subfooter.kmk

    r665 r725  
    2525#
    2626
    27 _SUB_MAKEFILE_STACK := $(filter-out $(words $(_SUB_MAKEFILE_STACK)), $(_SUB_MAKEFILE_STACK))
    28 ifeq ($(words $(_SUB_MAKEFILE_STACK)),0)
    29 include $(PATH_KBUILD)/footer.kmk
     27
     28#
     29# Set the default path for all new targets.
     30#
     31define def_subheader
     32ifndef $(target)_PATH
     33$(target)_PATH := $(PATH_SUB_CURRENT)
     34endif
     35ifndef $(target)_MAKEFILE
     36$(target)_MAKEFILE := $(MAKEFILE_CURRENT)
     37endif
     38endef
     39
     40$(foreach target,\
     41        $(ALL_TARGETS) \
     42        $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     43        $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     44        $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
     45        $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     46        $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     47        $(DLLS)        $(DLLS.$(BUILD_TARGET))          $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     48        $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET))      $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     49        $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET))       $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     50        $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET))      $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     51        $(OTHERS)      $(OTHERS.$(BUILD_TARGET))        $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     52,$(eval $(def_subheader)))
     53
     54
     55#
     56# Switch back to the context of previous makefile on the stack.
     57#
     58MAKEFILE_CURRENT := $(call stack-pop,_SUB_MAKEFILE_STACK)
     59PATH_SUB_CURRENT := $(abspath $(patsubst %/,%,$(dir $(MAKEFILE_CURRENT))))
     60
     61#
     62# When we reach the last makefile we include the footer.
     63#
     64ifeq ($(_SUB_MAKEFILE_STACK),)
     65 include $(PATH_KBUILD)/footer.kmk
    3066endif
    3167

  • trunk/kBuild/subheader.kmk

    r665 r725  
    2626
    2727ifndef _SUB_MAKEFILE_STACK
    28 _SUB_MAKEFILE_STACK := 1
    29 include $(PATH_KBUILD)/header.kmk
     28 #
     29 # The first time we just take the makefile context set by header.kmk.
     30 #
     31 include $(PATH_KBUILD)/header.kmk
     32
    3033else
    31 _SUB_MAKEFILE_STACK := $(_SUB_MAKEFILE_STACK) $(words $(_SUB_MAKEFILE_STACK) 1)
     34
     35 #
     36 # Set the default path and makefile for all new targets.
     37 #
     38 define def_subfooter
     39 ifndef $(target)_PATH
     40 $(target)_PATH := $(PATH_SUB_CURRENT)
     41 endif
     42 ifndef $(target)_MAKEFILE
     43 $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
     44 endif
     45 endef
     46
     47 $(foreach target,\
     48        $(ALL_TARGETS) \
     49        $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     50        $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     51        $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
     52        $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     53        $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     54        $(DLLS)        $(DLLS.$(BUILD_TARGET))          $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     55        $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET))      $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     56        $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET))       $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     57        $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET))      $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     58        $(OTHERS)      $(OTHERS.$(BUILD_TARGET))        $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     59 ,$(eval $(def_subfooter)))
     60
     61
     62 #
     63 # Switch context.
     64 #
     65 __tmp := $(MAKEFILE_LIST)
     66 $(call stack-popv,__tmp)
     67 MAKEFILE_CURRENT := $(call stack-top,__tmp)
     68 PATH_SUB_CURRENT := $(abspath $(patsubst %/,%,$(dir $(MAKEFILE_CURRENT))))
    3269endif
    3370
     71$(call stack-push,_SUB_MAKEFILE_STACK,$(MAKEFILE_CURRENT))
     72

  • trunk/src/gmake/function.c

    r720 r725  
    21192119 return o;
    21202120}
     2121
     2122#ifdef CONFIG_WITH_ABSPATHEX
     2123/* same as abspath except that the current path is given as the 2nd argument. */
     2124static char *
     2125func_abspathex (char *o, char **argv, const char *funcname UNUSED)
     2126{
     2127  /* Expand the argument.  */
     2128  char *p = argv[0];
     2129  PATH_VAR (current_directory);
     2130  char *cwd = argv[1];
     2131  unsigned int cwd_len = ~0U;
     2132  char *path = 0;
     2133  int doneany = 0;
     2134  unsigned int len = 0;
     2135  PATH_VAR (in);
     2136  PATH_VAR (out);
     2137
     2138  while ((path = find_next_token (&p, &len)) != 0)
     2139    {
     2140      if (len < GET_PATH_MAX)
     2141        {
     2142#ifdef HAVE_DOS_PATHS
     2143          if (path[0] != '/' && path[0] != '\\' && (len < 2 || path[1] != ':') && cwd)
     2144#else
     2145          if (path[0] != '/' && cwd)
     2146#endif
     2147            {
     2148              /* relative path, prefix with cwd. */
     2149              if (cwd_len == ~0U)
     2150                cwd_len = strlen (cwd);
     2151              if (cwd_len + len + 1 >= GET_PATH_MAX)
     2152                  continue;
     2153              memcpy (in, cwd, cwd_len)
     2154              in[cwd_len] = '/';
     2155              memcpy (in + cwd_len + 1, path, len);
     2156              in[cwd_len + len + 1] = '\0';
     2157            }
     2158          else
     2159            {
     2160              /* absolute path pass it as-is. */
     2161              memcpy (in, path, len);
     2162              in[len] = '\0';
     2163            }
     2164
     2165          if (abspath (in, out))
     2166            {
     2167              o = variable_buffer_output (o, out, strlen (out));
     2168              o = variable_buffer_output (o, " ", 1);
     2169              doneany = 1;
     2170            }
     2171        }
     2172    }
     2173
     2174  /* Kill last space.  */
     2175  if (doneany)
     2176    --o;
     2177
     2178 return o;
     2179}
     2180#endif
    21212181
    21222182#ifdef CONFIG_WITH_TOUPPER_TOLOWER
    … …  
    23782438  { STRING_SIZE_TUPLE("tolower"),       0,  1,  1,  func_toupper_tolower},
    23792439#endif
     2440#ifdef CONFIG_WITH_ABSPATHEX
     2441  { STRING_SIZE_TUPLE("abspathex"),     0,  2,  1,  func_abspathex},
     2442#endif
    23802443#if defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
    23812444  { STRING_SIZE_TUPLE("comp-vars"),     3,  3,  1,  func_comp_vars},

  • trunk/src/gmake/kbuild.c

    r646 r725  
    788788                           struct variable *pType, struct variable *pBldType,
    789789                           struct variable *pBldTrg, struct variable *pBldTrgArch, struct variable *pBldTrgCpu,
     790                           struct variable *pDefPath,
    790791                           const char *pszProp, const char *pszVarName, int iDirection)
    791792{
    … …  
    10021003            paVars[iVar].cchExp = strlen(paVars[iVar].pszExp);
    10031004        }
     1005        if (pDefPath)
     1006        {
     1007            /** @todo */
     1008        }
    10041009        cchTotal += paVars[iVar].cchExp + 1;
    10051010    }
    … …  
    10301035}
    10311036
    1032 /* get a source property. */
     1037/* get a source property. Doesn't respect the default path. */
    10331038char *
    10341039func_kbuild_source_prop(char *o, char **argv, const char *pszFuncName)
    … …  
    10561061    pVar = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType,
    10571062                                      pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
     1063                                      NULL,
    10581064                                      argv[0], argv[1], iDirection);
    10591065    if (pVar)
    … …  
    11901196    struct variable *pTarget    = kbuild_get_variable("target");
    11911197    struct variable *pSource    = kbuild_get_variable("source");
     1198    struct variable *pDefPath   = kbuild_get_variable("defpath");
    11921199    struct variable *pType      = kbuild_get_variable("type");
    11931200    struct variable *pBldType   = kbuild_get_variable("bld_type");
    … …  
    12071214    kbuild_get_sdks(&Sdks, pTarget, pSource, pBldType, pBldTrg, pBldTrgArch);
    12081215
    1209     pDefs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
     1216    if (pDefPath && !pDefPath->value_length)
     1217        pDefPath = NULL;
     1218    pDefs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL,
    12101219                                        "DEFS", "defs", 1/* left-to-right */);
    1211     pIncs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
     1220    pIncs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL,
    12121221                                        "INCS", "incs", -1/* right-to-left */);
    1213     pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
     1222    pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath,
    12141223                                        "FLAGS", "flags", 1/* left-to-right */);
    1215     pDeps  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
     1224    pDeps  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath,
    12161225                                        "DEPS", "deps", 1/* left-to-right */);
    12171226
Note: See TracChangeset for help on using the changeset viewer.