Changeset 827 in kBuild for trunk/src/gmake
- Timestamp:
- Feb 3, 2007 1:08:29 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gmake/kbuild.c
r813 r827 1335 1335 struct variable *pOutBase = kbuild_get_object_base(pTarget, pSource, "outbase"); 1336 1336 struct variable *pObjSuff = kbuild_get_object_suffix(pTarget, pSource, pTool, pType, pBldTrg, pBldTrgArch, "objsuff"); 1337 struct variable *pDefs, *pIncs, *pFlags, *pDeps, *p DirDep, *pDep, *pVar, *pOutput;1337 struct variable *pDefs, *pIncs, *pFlags, *pDeps, *pOrderDeps, *pDirDep, *pDep, *pVar, *pOutput; 1338 1338 struct variable *pObj = kbuild_set_object_name_and_dep_and_dirdep_and_PATH_target_source(pTarget, pSource, pOutBase, pObjSuff, "obj", &pDep, &pDirDep); 1339 1339 char *pszDstVar, *pszDst, *pszSrcVar, *pszSrc, *pszVal, *psz; … … 1350 1350 if (pDefPath && !pDefPath->value_length) 1351 1351 pDefPath = NULL; 1352 pDefs = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL, 1353 "DEFS", "defs", 1/* left-to-right */); 1354 pIncs = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath, 1355 "INCS", "incs", -1/* right-to-left */); 1356 pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL, 1357 "FLAGS", "flags", 1/* left-to-right */); 1358 pDeps = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath, 1359 "DEPS", "deps", 1/* left-to-right */); 1352 pDefs = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL, 1353 "DEFS", "defs", 1/* left-to-right */); 1354 pIncs = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath, 1355 "INCS", "incs", -1/* right-to-left */); 1356 pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, NULL, 1357 "FLAGS", "flags", 1/* left-to-right */); 1358 pDeps = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath, 1359 "DEPS", "deps", 1/* left-to-right */); 1360 pOrderDeps = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu, pDefPath, 1361 "ORDERDEPS", "orderdeps", 1/* left-to-right */); 1360 1362 1361 1363 /* … … 1429 1431 memcpy(pszDst, "_DEPORD_", sizeof("_DEPORD_")); 1430 1432 pVar = kbuild_get_recursive_variable(pszSrcVar); 1431 psz = pszVal = xmalloc(pVar->value_length + 1 + pDirDep->value_length + 1 );1433 psz = pszVal = xmalloc(pVar->value_length + 1 + pDirDep->value_length + 1 + pOrderDeps->value_length + 1); 1432 1434 memcpy(psz, pVar->value, pVar->value_length); psz += pVar->value_length; 1433 1435 *psz++ = ' '; 1434 memcpy(psz, pDirDep->value, pDirDep->value_length + 1); 1436 memcpy(psz, pDirDep->value, pDirDep->value_length); psz += pDirDep->value_length; 1437 *psz++ = ' '; 1438 memcpy(psz, pOrderDeps->value, pOrderDeps->value_length + 1); 1435 1439 do_variable_definition(NILF, pszDstVar, pszVal, o_file, f_simple, 0 /* !target_var */); 1436 1440 free(pszVal);
Note:
See TracChangeset
for help on using the changeset viewer.