VirtualBox

Changeset 827 in kBuild for trunk/src/gmake


Ignore:
Timestamp:
Feb 3, 2007 1:08:29 AM (18 years ago)
Author:
bird
Message:

New property 'ORDERDEPS' for listing order-only dependencies.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gmake/kbuild.c

    r813 r827  
    13351335    struct variable *pOutBase   = kbuild_get_object_base(pTarget, pSource, "outbase");
    13361336    struct variable *pObjSuff   = kbuild_get_object_suffix(pTarget, pSource, pTool, pType, pBldTrg, pBldTrgArch, "objsuff");
    1337     struct variable *pDefs, *pIncs, *pFlags, *pDeps, *pDirDep, *pDep, *pVar, *pOutput;
     1337    struct variable *pDefs, *pIncs, *pFlags, *pDeps, *pOrderDeps, *pDirDep, *pDep, *pVar, *pOutput;
    13381338    struct variable *pObj       = kbuild_set_object_name_and_dep_and_dirdep_and_PATH_target_source(pTarget, pSource, pOutBase, pObjSuff, "obj", &pDep, &pDirDep);
    13391339    char *pszDstVar, *pszDst, *pszSrcVar, *pszSrc, *pszVal, *psz;
     
    13501350    if (pDefPath && !pDefPath->value_length)
    13511351        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 */);
    13601362
    13611363    /*
     
    14291431    memcpy(pszDst, "_DEPORD_", sizeof("_DEPORD_"));
    14301432    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);
    14321434    memcpy(psz, pVar->value, pVar->value_length);       psz += pVar->value_length;
    14331435    *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);
    14351439    do_variable_definition(NILF, pszDstVar, pszVal, o_file, f_simple, 0 /* !target_var */);
    14361440    free(pszVal);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette