Print this page
make: restore a couple of blocks of code from DISTRIBUTED that should have been TEAMWARE_MAKE_CMN

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/doname.cc
          +++ new/usr/src/cmd/make/bin/doname.cc
↓ open down ↓ 961 lines elided ↑ open up ↑
 962  962                  }
 963  963  
 964  964                  if (dependency->name == wait_name) {
 965  965                          /*
 966  966                           * The special target .WAIT means finish all of
 967  967                           * the prior dependencies before continuing.
 968  968                           */
 969  969                          if (dependencies_running) {
 970  970                                  break;
 971  971                          }
      972 +                } else if ((!parallel_ok(dependency->name, false)) &&
      973 +                           (dependencies_running)) {
      974 +                        /*
      975 +                         * If we can't execute the current dependency in
      976 +                         * parallel, hold off the dependency processing
      977 +                         * to preserve the order of the dependencies.
      978 +                         */
      979 +                        break;
 972  980                  } else {
 973  981                          timestruc_t     depe_time = file_doesnt_exist;
 974  982  
 975  983  
 976  984                          if (true_target->is_member) {
 977  985                                  depe_time = exists(dependency->name);
 978  986                          }
 979  987                          if (dependency->built ||
 980  988                              (dependency->name->state == build_failed)) {
 981  989                                  dep_result = (Doname) dependency->name->state;
↓ open down ↓ 2350 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX