Print this page
make: unifdef for NSE (undefined)
*** 369,382 ****
* that doesn't belong to us.
*/
make_state_lockfile = NULL;
make_state_locked = false;
- #ifdef NSE
- nse_depinfo_lockfile[0] = '\0';
- nse_depinfo_locked = false;
- #endif
/*
* look for last slash char in the path to look at the binary
* name. This is to resolve the hard link and invoke make
* in svr4 mode.
--- 369,378 ----
*** 696,714 ****
(void) fprintf(report_file, "\n");
}
}
/*
! * Make sure SUNPRO_DEPENDENCIES is exported (or not) properly
! * and NSE_DEP.
*/
if (keep_state) {
maybe_append_prop(sunpro_dependencies, macro_prop)->
body.macro.exported = true;
- #ifdef NSE
- (void) setenv(NOCATGETS("NSE_DEP"), get_current_path());
- #endif
} else {
maybe_append_prop(sunpro_dependencies, macro_prop)->
body.macro.exported = false;
}
--- 692,706 ----
(void) fprintf(report_file, "\n");
}
}
/*
! * Make sure SUNPRO_DEPENDENCIES is exported (or not) properly.
*/
if (keep_state) {
maybe_append_prop(sunpro_dependencies, macro_prop)->
body.macro.exported = true;
} else {
maybe_append_prop(sunpro_dependencies, macro_prop)->
body.macro.exported = false;
}
*** 767,788 ****
make_targets(argc, argv, parallel_flag);
report_dir_enter_leave(false);
- #ifdef NSE
- exit(nse_exit_status());
- #else
if (build_failed_ever_seen) {
if (posix) {
exit_status = 1;
}
exit(1);
}
exit_status = 0;
exit(0);
- #endif
/* NOTREACHED */
}
/*
* cleanup_after_exit()
--- 759,776 ----
*** 813,827 ****
*/
extern "C" void
cleanup_after_exit(void)
{
Running rp;
- #ifdef NSE
- char push_cmd[NSE_TFS_PUSH_LEN + 3 +
- (MAXPATHLEN * MB_LEN_MAX) + 12];
- char *active;
- #endif
extern long getname_bytes_count;
extern long getname_names_count;
extern long getname_struct_count;
extern long freename_bytes_count;
--- 801,810 ----
*** 958,985 ****
cleanup->set_exit_status(exit_status);
delete cleanup;
#endif
#endif
- #ifdef NSE
- /* If running inside an activated environment, push the */
- /* .nse_depinfo file (if written) */
- active = getenv(NSE_VARIANT_ENV);
- if (keep_state &&
- (active != NULL) &&
- !IS_EQUAL(active, NSE_RT_SOURCE_NAME) &&
- !do_not_exec_rule &&
- (report_dependencies_level == 0)) {
- (void) sprintf(push_cmd,
- "%s %s/%s",
- NSE_TFS_PUSH,
- get_current_path(),
- NSE_DEPINFO);
- (void) system(push_cmd);
- }
- #endif
-
/*
#ifdef DISTRIBUTED
}
#endif
*/
--- 941,950 ----
*** 1160,1176 ****
if ((make_state_lockfile != NULL) && (make_state_locked)) {
unlink(make_state_lockfile);
make_state_lockfile = NULL;
make_state_locked = false;
}
- #ifdef NSE
- if ((nse_depinfo_lockfile[0] != '\0') && (nse_depinfo_locked)) {
- unlink(nse_depinfo_lockfile);
- nse_depinfo_lockfile[0] = '\0';
- nse_depinfo_locked = false;
- }
- #endif
/*
* Re-read .make.state file (it might be changed by recursive make)
*/
check_state(NULL);
--- 1125,1134 ----
*** 1698,1717 ****
debug_level--;
} else {
debug_level++;
}
return 0;
- #ifdef NSE
- case 'E':
- if (invert_this) {
- nse = false;
- } else {
- nse = true;
- }
- nse_init_source_suffixes();
- return 0;
- #endif
case 'e': /* Environment override flag */
if (invert_this) {
env_wins = false;
} else {
env_wins = true;
--- 1656,1665 ----
*** 2058,2068 ****
* keep_state Set if KEEP_STATE is in environment
* make_state The Name ".make.state", used to read file
* makefile_type Set to type of file being read
* makeflags The Name "MAKEFLAGS", used to set macro value
* not_auto dwight
- * nse Set if NSE_ENV is in the environment
* read_trace_level Checked to se if the reader should trace
* report_dependencies If -P is on we do not read .make.state
* trace_reader Set if reader should trace
* virtual_root The Name "VIRTUAL_ROOT", used to check value
*/
--- 2006,2015 ----
*** 2125,2139 ****
sdotMakefile = GETNAME(wcs_buffer, FIND_LENGTH);
/*
* Set flag if NSE is active
*/
- #ifdef NSE
- if (getenv(NOCATGETS("NSE_ENV")) != NULL) {
- nse = true;
- }
- #endif
/*
* initialize global dependency entry for .NOT_AUTO
*/
not_auto_depen->next = NULL;
--- 2072,2081 ----
*** 2234,2248 ****
append_char('d', &makeflags_string_posix);
case 1:
append_char('d', &makeflags_string);
append_char('d', &makeflags_string_posix);
}
- #ifdef NSE
- if (nse) {
- append_char('E', &makeflags_string);
- }
- #endif
if (env_wins) {
append_char('e', &makeflags_string);
append_char('e', &makeflags_string_posix);
}
if (ignore_errors_all) {
--- 2176,2185 ----
*** 3042,3070 ****
read_only_saved = false;
}
}
/*
! * We ignore SUNPRO_DEPENDENCIES and NSE_DEP. Those
! * environment variables are set by make and read by
! * cpp which then writes info to .make.dependency.xxx and
! * .nse_depinfo. When make is invoked by another make
! * (recursive make), we don't want to read this because
! * then the child make will end up writing to the parent
! * directory's .make.state and .nse_depinfo and clobbering
! * them.
*/
MBSTOWCS(wcs_buffer2, NOCATGETS("SUNPRO_DEPENDENCIES"));
if (IS_WEQUALN(name, wcs_buffer2, wslen(wcs_buffer2))) {
continue;
}
- #ifdef NSE
- MBSTOWCS(wcs_buffer2, NOCATGETS("NSE_DEP"));
- if (IS_WEQUALN(name, wcs_buffer2, wslen(wcs_buffer2))) {
- continue;
- }
- #endif
macro = GETNAME(name, value - name);
maybe_append_prop(macro, macro_prop)->body.macro.exported =
true;
if ((value == NULL) || ((value + 1)[0] == (int) nul_char)) {
--- 2979,2999 ----
read_only_saved = false;
}
}
/*
! * We ignore SUNPRO_DEPENDENCIES. This environment variable is
! * set by make and read by cpp which then writes info to
! * .make.dependency.xxx. When make is invoked by another make
! * (recursive make), we don't want to read this because then
! * the child make will end up writing to the parent
! * directory's .make.state and clobbering them.
*/
MBSTOWCS(wcs_buffer2, NOCATGETS("SUNPRO_DEPENDENCIES"));
if (IS_WEQUALN(name, wcs_buffer2, wslen(wcs_buffer2))) {
continue;
}
macro = GETNAME(name, value - name);
maybe_append_prop(macro, macro_prop)->body.macro.exported =
true;
if ((value == NULL) || ((value + 1)[0] == (int) nul_char)) {
*** 3074,3090 ****
} else {
val = setvar_daemon(macro,
GETNAME(value + 1, FIND_LENGTH),
false, no_daemon, false, debug_level);
}
- #ifdef NSE
- /*
- * Must be after the call to setvar() as it sets
- * imported to false.
- */
- maybe_append_prop(macro, macro_prop)->body.macro.imported = true;
- #endif
val->body.macro.read_only = read_only_saved;
if (alloced_tmp_wcs_buffer) {
retmem(tmp_wcs_buffer);
alloced_tmp_wcs_buffer = false;
}
--- 3003,3012 ----
*** 3115,3127 ****
{
Boolean b;
makefile_type = reading_makefile;
recursion_level = 0;
- #ifdef NSE
- wscpy(current_makefile, makefile->string);
- #endif
reading_dependencies = true;
b = read_simple_file(makefile, true, true, complain,
must_exist, report_file, false);
reading_dependencies = false;
return b;
--- 3037,3046 ----
*** 3408,3420 ****
if (primary_makefile == NULL) {
/*
* This can happen when there is no makefile and
* only implicit rules are being used.
*/
- #ifdef NSE
- nse_no_makefile(target);
- #endif
return;
}
(void) fprintf(report_file,
"%s: %s ",
get_target_being_reported_for(),
--- 3327,3336 ----