Print this page
make: remove maketool support

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/parallel.cc
          +++ new/usr/src/cmd/make/bin/parallel.cc
↓ open down ↓ 1136 lines elided ↑ open up ↑
1137 1137                          } else {
1138 1138                                  return;
1139 1139                          }
1140 1140                  }
1141 1141                  for (rp = running_list;
1142 1142                       (rp != NULL) && (rp->pid != pid);
1143 1143                       rp = rp->next) {
1144 1144                          ;
1145 1145                  }
1146 1146                  if (rp == NULL) {
1147      -                        if (send_mtool_msgs) {
1148      -                                continue;
1149      -                        } else {
1150      -                                fatal(catgets(catd, 1, 128, "Internal error: returned child pid not in running_list"));
1151      -                        }
     1147 +                        fatal(catgets(catd, 1, 128, "Internal error: returned child pid not in running_list"));
1152 1148                  } else {
1153 1149                          rp->state = (WIFEXITED(status) && WEXITSTATUS(status) == 0) ? build_ok : build_failed;
1154 1150                  }
1155 1151                  nohang = true;
1156 1152                  parallel_process_cnt--;
1157 1153  
1158 1154  #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
1159 1155                  if (job_adjust_mode == ADJUST_M2) {
1160 1156                          if (m2_release_job()) {
1161 1157                                  job_adjust_error();
↓ open down ↓ 669 lines elided ↑ open up ↑
1831 1827                          if ((command->hash.length > 0) &&
1832 1828                              !silent_flag) {
1833 1829                                  (void) printf("%s\n", command->string_mb);
1834 1830                          }
1835 1831                          result = dosys(command,
1836 1832                                         ignore,
1837 1833                                         false,
1838 1834                                         false, /* bugs #4085164 & #4990057 */
1839 1835                                         /* BOOLEAN(silent_flag && ignore), */
1840 1836                                         always_exec, 
1841      -                                       (Name) NULL,
1842      -                                       false);
     1837 +                                       (Name) NULL);
1843 1838                          if (result == build_failed) {
1844 1839                                  if (silent_flag) {
1845 1840                                          (void) printf(catgets(catd, 1, 152, "The following command caused the error:\n%s\n"), command->string_mb);
1846 1841                                  }
1847 1842                                  if (!ignore) {
1848 1843                                          _exit(1);
1849 1844                                  }
1850 1845                          }
1851 1846                  }
1852 1847                  _exit(0);
↓ open down ↓ 58 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX