Print this page
make: unifdef for SGE (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 500 lines elided ↑ open up ↑
 501  501                  no_parallel = false;
 502  502          } else {
 503  503                  dmake_value2 = prop2->body.macro.value;
 504  504                  if ((dmake_value2 == NULL) ||
 505  505                      (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("distributed")))) {
 506  506                          dmake_mode_type = distributed_mode;
 507  507                          no_parallel = false;
 508  508                  } else if (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("parallel"))) {
 509  509                          dmake_mode_type = parallel_mode;
 510  510                          no_parallel = false;
 511      -#ifdef SGE_SUPPORT
 512      -                        grid = false;
 513      -                } else if (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("grid"))) {
 514      -                        dmake_mode_type = parallel_mode;
 515      -                        no_parallel = false;
 516      -                        grid = true;
 517      -#endif
 518  511                  } else if (IS_EQUAL(dmake_value2->string_mb, NOCATGETS("serial"))) {
 519  512                          dmake_mode_type = serial_mode;
 520  513                          no_parallel = true;
 521  514                  } else {
 522  515                          fatal(catgets(catd, 1, 307, "Unknown dmake mode argument `%s' after -m flag"), dmake_value2->string_mb);
 523  516                  }
 524  517          }
 525  518  
 526  519          if ((!list_all_targets) &&
 527  520              (report_dependencies_level == 0)) {
↓ open down ↓ 554 lines elided ↑ open up ↑
1082 1075                                  } else {
1083 1076                                          (void) fprintf(stderr,
1084 1077                                                         catgets(catd, 1, 173, "could not be removed: %s.\n"),
1085 1078                                                         rp->target->string_mb,
1086 1079                                                         errmsg(errno));
1087 1080                                  }
1088 1081                          }
1089 1082                  }
1090 1083          }
1091 1084  
1092      -#ifdef SGE_SUPPORT
1093      -        /* Remove SGE script file */
1094      -        if (grid) {
1095      -                unlink(script_file);
1096      -        }
1097      -#endif
1098 1085  
1099 1086          /* Have we locked .make.state or .nse_depinfo? */
1100 1087          if ((make_state_lockfile != NULL) && (make_state_locked)) {
1101 1088                  unlink(make_state_lockfile);
1102 1089                  make_state_lockfile = NULL;
1103 1090                  make_state_locked = false;
1104 1091          }
1105 1092          /*
1106 1093           * Re-read .make.state file (it might be changed by recursive make)
1107 1094           */
↓ open down ↓ 2489 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX