From 3b269bfd4331558b2b462c87408aa6b0c6f8c227 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Thu, 4 Apr 2013 18:02:17 +0000 Subject: [PATCH] OS-2111 dmake not properly resetting conditoinal variables --- make/dmake.patch | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/make/dmake.patch b/make/dmake.patch index 0b10743c..5e158c01 100644 --- a/make/dmake.patch +++ b/make/dmake.patch @@ -1,10 +1,10 @@ -From c088aa46067c54f3dfe824a1943638f9d8d473f8 Mon Sep 17 00:00:00 2001 +From fb00928e476a57195ee6775bd16567c0afc66837 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Mon, 25 Mar 2013 18:58:29 +0000 Subject: [PATCH] add dmake support --- - src/make_src/Make/bin/make/common/doname.cc | 3 +- + src/make_src/Make/bin/make/common/doname.cc | 6 +-- src/make_src/Make/bin/make/common/main.cc | 42 ++++++++++---------- src/make_src/Make/bin/make/common/parallel.cc | 14 ++++++- src/make_src/Make/bin/make/smake/src/Variant.mk | 8 +++- @@ -12,10 +12,10 @@ Subject: [PATCH] add dmake support src/make_src/Make/lib/mksh/src/dosys.cc | 4 +- src/make_src/Make/lib/mksh/src/mksh.cc | 2 +- src/make_src/rules/master.mk | 3 +- - 8 files changed, 54 insertions(+), 30 deletions(-) + 8 files changed, 54 insertions(+), 33 deletions(-) diff --git a/src/make_src/Make/bin/make/common/doname.cc b/src/make_src/Make/bin/make/common/doname.cc -index c06ba2f..2b18983 100644 +index c06ba2f..8a38a13 100644 --- a/src/make_src/Make/bin/make/common/doname.cc +++ b/src/make_src/Make/bin/make/common/doname.cc @@ -39,7 +39,7 @@ @@ -27,14 +27,30 @@ index c06ba2f..2b18983 100644 #endif #if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */ -@@ -3419,7 +3419,6 @@ reset_locals(register Name target, register Property old_locals, register Proper +@@ -3353,11 +3353,9 @@ set_locals(register Name target, register Property old_locals) + Chain cond_name; + Chain cond_chain; + +-#ifdef DISTRIBUTED + if (target->dont_activate_cond_values) { return; } - #endif -- +-#endif + + saved_conditional_macro_used = conditional_macro_used; + +@@ -3414,11 +3412,9 @@ reset_locals(register Name target, register Property old_locals, register Proper + register Property this_conditional; + Chain cond_chain; + +-#ifdef DISTRIBUTED + if (target->dont_activate_cond_values) { + return; + } +-#endif + /* Scan the list of conditional properties and restore the old value */ /* to each one Reverse the order relative to when we assigned macros */ - this_conditional = get_prop(conditional->next, conditional_prop); diff --git a/src/make_src/Make/bin/make/common/main.cc b/src/make_src/Make/bin/make/common/main.cc index 1289837..889eae8 100644 --- a/src/make_src/Make/bin/make/common/main.cc @@ -344,5 +360,5 @@ index f113efe..3d3cb57 100644 LINTFLAGS += -buxz -- -1.7.7.2 +1.7.3.4