Print this page
make: remove more distributed mode code

@@ -98,11 +98,10 @@
 /*
  *      execute_parallel(line, waitflg)
  *
  *      DMake 2.x:
  *      parallel mode: spawns a parallel process to execute the command group.
- *      distributed mode: sends the command group down the pipe to rxm.
  *
  *      Return value:
  *                              The result of the execution
  *
  *      Parameters:

@@ -181,29 +180,18 @@
                 }
                 if (vpath_defined) {
                         rule->command_line =
                           vpath_translation(rule->command_line);
                 }
-                if (dmake_mode_type == distributed_mode) {
-                        cmd_options = 0;
-                        if(local) {
-                                cmd_options |= local_host_mask;
-                        }
-                } else {
+                
                         silent_flag = false;
                         ignore = 0;
-                }
+
                 if (rule->command_line->hash.length > 0) {
                         if (++argcnt == MAXRULES) {
-                                if (dmake_mode_type == distributed_mode) {
-                                        /* XXX - tell rxm to execute on local host. */
-                                        /* I WAS HERE!!! */
-                                } else {
-                                        /* Too many rules, run serially instead. */
                                         return build_serial;
                                 }
-                        }
                         {
                                 if (rule->silent && !silent) {
                                         silent_flag = true;
                                 }
                                 if (rule->ignore_error) {

@@ -1224,25 +1212,23 @@
                                 running_tail = rp_prev;
                         }
                         if ((line2 = rp->command) == NULL) {
                                 line2 = get_prop(rp->target->prop, line_prop);
                         }
-                        if (dmake_mode_type == distributed_mode) {
-                                if (rp->make_refd) {
-                                        maybe_reread_make_state();
-                                }
-                        } else {
+
+
                                 /*
                                  * Check if there were any job output
                                  * from the parallel build.
                                  */
                                 if (rp->stdout_file != NULL) {
                                         if (stat(rp->stdout_file, &out_buf) < 0) {
                                                 fatal(catgets(catd, 1, 130, "stat of %s failed: %s"),
                                                       rp->stdout_file,
                                                       errmsg(errno));
                                         }
+
                                         if ((line2 != NULL) &&
                                             (out_buf.st_size > 0)) {
                                                 cmds_length = 0;
                                                 for (rule = line2->body.line.command_used,
                                                      silent_flag = silent;

@@ -1273,11 +1259,11 @@
                                         }
                                         (void) unlink(rp->stderr_file);
                                         retmem_mb(rp->stderr_file);
                                         rp->stderr_file = NULL;
                                 }
-                        }
+                        
                         check_state(rp->temp_file);
                         if (rp->temp_file != NULL) {
                                 free_name(rp->temp_file);
                         }
                         rp->temp_file = NULL;