Print this page
make: unifdef for PARALLEL (undefined, this relates to the old pmake)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/doname.cc
          +++ new/usr/src/cmd/make/bin/doname.cc
↓ open down ↓ 47 lines elided ↑ open up ↑
  48   48  #       include <rw/xdrstrea.h>
  49   49  #endif
  50   50  
  51   51  #include <fcntl.h>
  52   52  #include <mk/defs.h>
  53   53  #include <mksh/i18n.h>          /* get_char_semantics_value() */
  54   54  #include <mksh/macro.h>         /* getvar(), expand_value() */
  55   55  #include <mksh/misc.h>          /* getmem() */
  56   56  #include <poll.h>
  57   57  
  58      -#ifdef PARALLEL
  59      -#       include <rx/api.h>
  60      -#endif
  61   58  
  62   59  #include <signal.h>
  63   60  
  64   61  #       include <stropts.h>
  65   62  
  66   63  #include <sys/errno.h>
  67   64  #include <sys/stat.h>
  68   65  #include <sys/types.h>
  69   66  #include <sys/utsname.h>        /* uname() */
  70   67  #include <sys/wait.h>
  71   68  #include <unistd.h>             /* close() */
  72   69  
  73   70  /*
  74   71   * Defined macros
  75   72   */
  76      -#ifndef PARALLEL
  77   73  #       define LOCALHOST "localhost"
  78      -#endif
  79   74  
  80   75  #define MAXRULES 100
  81   76  
  82   77  #if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
  83   78  #define SEND_MTOOL_MSG(cmds) \
  84   79          if (send_mtool_msgs) { \
  85   80                  cmds \
  86   81          }
  87   82  #else
  88   83  #define SEND_MTOOL_MSG(cmds) 
↓ open down ↓ 451 lines elided ↑ open up ↑
 540  535                                         rechecking_target,
 541  536                                         recheck_conditionals)) {
 542  537                          return build_running;
 543  538                  }
 544  539                  if (line->body.line.query != NULL) {
 545  540                          delete_query_chain(line->body.line.query);
 546  541                  }
 547  542                  line->body.line.query = out_of_date_list;
 548  543          }
 549  544  
 550      -#ifdef PARALLEL
 551      -        if (doing_subtree) {
 552      -                parallel = false;
 553      -        }
 554      -#endif
 555  545  
 556  546  /*
 557  547   * If the target is a :: type, do not try to find the rule for the target,
 558  548   * all actions will be taken by separate branches.
 559  549   * Else, we try to find an implicit rule using various methods,
 560  550   * we quit as soon as one is found.
 561  551   *
 562  552   * [tolik, 12 Sep 2002] Do not try to find implicit rule for the target
 563  553   * being rechecked - the target is being rechecked means that it already
 564  554   * has explicit dependencies derived from an implicit rule found
↓ open down ↓ 3168 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX