Canonicalize variable usage in testsuite Makefiles

This test streamlines our use of variables that are expected by
Makefile.rules throughout the test suite. Mostly it replaced
potentially dangerous overrides and updates of variables like CFLAGS
with safe assignments to variables reserved for this purpose like
CFLAGS_EXTRAS.

Differential Revision: https://reviews.llvm.org/D67984

llvm-svn: 372795

diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile
index dac447e5c70b30aa4a161f64a1ad25861bb64f10..f8f686a345520c97b38d5c5a207d20a94e95470b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS = -mthumb
+CFLAGS_EXTRAS := -mthumb
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile
index 0d6bbe2df01089a2910e8163913dbba9f527625c..3f8e5597f7ddee3e1dab24953381b0c46a52d1af 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS = -mthumb
+CFLAGS_EXTRAS := -mthumb
 
 include Makefile.rules
\ No newline at end of file

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
index 33746217ecbae5cd30259928e9635b86df76f2fb..becb2f0965868c19663ab7e09e9a983ae474b901 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
@@ -1,4 +1,3 @@
 OBJC_SOURCES := call-throws.m
-
+LD_EXTRAS := -framework Foundation
 include Makefile.rules
-LDFLAGS += -framework Foundation

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
index 2f36b673031d65e4e1156c940bfd2945e7a37d57..a3198db9e8e8847900d0cff8163b449234ca7d90 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
@@ -1,4 +1,3 @@
 OBJC_SOURCES := main.m
-
+LD_EXTRAS := -framework Foundation
 include Makefile.rules
-LDFLAGS += -framework Foundation

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
index 4aa2b432f1282ae0bea3f9a0b96f41a5283e5f51..019a94d53a96f7327bb378deac5b53359ff394ad 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
@@ -3,6 +3,7 @@
 # system headers.
 NO_TEST_COMMON_H := 1
 
-CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++
+CXXFLAGS_EXTRAS := -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++
 CXX_SOURCES := main.cpp
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
index 780b2660cd076e23e2aa3b19ef8559e7a35d3452..b46bd7f39a92bc5ad2effdaaeb35e9d41f53a683 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
@@ -1,4 +1,3 @@
 OBJC_SOURCES := main.m
-
+LD_EXTRAS := -framework Cocoa
 include Makefile.rules
-LDFLAGS += -framework Cocoa

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
index 9267f734396cba934411566666ad6225b86c6559..4d12ff1b43e269c6d60463d398803a2f547b0229 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
@@ -1,4 +1,5 @@
 OBJCXX_SOURCES := main.mm util.mm
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
index add737b47522459361a1437701516458232d2fce..69a2ad6b8d8b794135a569ffa7d893522691a34e 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
-LDFLAGS += -framework Foundation -framework CloudKit
 
+LD_EXTRAS := -framework Foundation -framework CloudKit
+
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
index 2f36b673031d65e4e1156c940bfd2945e7a37d57..9e812e1cf7854dc1076b60afa0100e54e883f611 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
@@ -1,4 +1,5 @@
 OBJC_SOURCES := main.m
 
+
+LD_EXTRAS := -framework Foundation
 include Makefile.rules
-LDFLAGS += -framework Foundation

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
index 4b46fe22a8b0431ab021bf21211f4ba7a33a5803..4eb417eeb57ac0aabf06bab809f9b86730e2df24 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
@@ -1,4 +1,5 @@
 CXX_SOURCES := main.cpp
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
+
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
index b8b1d12fe2ba88928b6a01fa343e8d4ffcf2da92..c82383d9400ccf231d545d751e7be0bd4c69b1f0 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m foo.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
index 9786ff38a8461848022864af5b6745500bef17d1..c8b38907ac92250c3c28e98af441da1ffb04766a 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
@@ -1,4 +1,4 @@
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 LD_FLAGS := -dynamiclib
 include Makefile.rules
 

diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile
index b016328910eafce079fcce74c56d6ce7f2a5a040..8248c01fe6a8ceb88d6700c41c473f8d10ff3a28 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile
@@ -1,8 +1,9 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -g0 # No debug info.
+CFLAGS_EXTRAS := -g0 # No debug info.
 MAKE_DSYM := NO
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile
index 202f88e410e365de288377617c0f503fa2525ee7..5cc7382f1d92f534332582c5efbbe7790840d79a 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd
+CFLAGS_EXTRAS := -mmpx -fcheck-pointer-bounds -fuse-ld=bfd
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile
index 202f88e410e365de288377617c0f503fa2525ee7..5cc7382f1d92f534332582c5efbbe7790840d79a 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd
+CFLAGS_EXTRAS := -mmpx -fcheck-pointer-bounds -fuse-ld=bfd
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile
index b6309174c4c71dc2828b404ef41c8de44d533a98..ad42b20df4ed552ef2bcb36e64852ba072d7e7c1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99 -gcolumn-info
+CFLAGS_EXTRAS := -std=c99 -gcolumn-info
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
index 56bf159ec07298bf3aa420cbdc432c19c8519147..2c00681fa2280422dbe83a22b21bd7e80c1bf8e1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
@@ -1,7 +1,8 @@
 CXX_SOURCES := main.cpp
 
 ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
+    CXXFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
index f25c0ea8055c0279ffec1293f9845345fcd5c04b..9645fd9cc8dfbca23e168e8495511d3712000e98 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
@@ -1,7 +1,7 @@
 C_SOURCES := main.c
 
 ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
+    CFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile
index 56bf159ec07298bf3aa420cbdc432c19c8519147..2c00681fa2280422dbe83a22b21bd7e80c1bf8e1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile
@@ -1,7 +1,8 @@
 CXX_SOURCES := main.cpp
 
 ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
+    CXXFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
index 56bf159ec07298bf3aa420cbdc432c19c8519147..2c00681fa2280422dbe83a22b21bd7e80c1bf8e1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
@@ -1,7 +1,8 @@
 CXX_SOURCES := main.cpp
 
 ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
+    CXXFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
index f25c0ea8055c0279ffec1293f9845345fcd5c04b..9645fd9cc8dfbca23e168e8495511d3712000e98 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
@@ -1,7 +1,7 @@
 C_SOURCES := main.c
 
 ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
+    CFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile
index f25c0ea8055c0279ffec1293f9845345fcd5c04b..9645fd9cc8dfbca23e168e8495511d3712000e98 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile
@@ -1,7 +1,7 @@
 C_SOURCES := main.c
 
 ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
+    CFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile
index 56bf159ec07298bf3aa420cbdc432c19c8519147..2c00681fa2280422dbe83a22b21bd7e80c1bf8e1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile
@@ -1,7 +1,8 @@
 CXX_SOURCES := main.cpp
 
 ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
+    CXXFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
index 377a1a0373a0d136f4dccb48e04f61cb92e69d5f..876340159d9c88b63220eb1e144f8b4d3334190f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
@@ -1,7 +1,8 @@
 OBJCXX_SOURCES := main.mm
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
index 86bbe461026ecb47052273c3e83fa988ce8f0b4c..a537b994079eea07ec160c26d9d27970d6d52bb1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
@@ -1,5 +1,4 @@
 CXX_SOURCES := main.cpp
-
+LD_EXTRAS := -framework Accelerate
 include Makefile.rules
 
-LDFLAGS += -framework Accelerate
\ No newline at end of file

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
index 720d1b1ca5afb32ec52371d13e5ab4a13ccc5fba..6bfb97cd2c2bc3e91169826b0a240678e73f906d 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -1,6 +1,7 @@
 CXX_SOURCES := main.cpp
 USE_LIBSTDCPP := 0
 
-include Makefile.rules
 
-CXXFLAGS += -O0
+
+CXXFLAGS_EXTRAS := -O0
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
index 22307c41c1c325a45bcf65bb5f428dee55f9bbf3..b016f006747dafa9ed630b6e995e1d6b1b04997b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile
@@ -1,4 +1,5 @@
 CXX_SOURCES := main.cpp
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 USE_LIBCPP := 1
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
index 22307c41c1c325a45bcf65bb5f428dee55f9bbf3..b016f006747dafa9ed630b6e995e1d6b1b04997b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile
@@ -1,4 +1,5 @@
 CXX_SOURCES := main.cpp
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 USE_LIBCPP := 1
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
index 29c68ae57401666f32d8d6cdbda3ef618ebabf82..e78030cbf75285e706c69690c658fe1043007c89 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
index 5ad5241858d80e97b6b554e11df4a6112431d08e..23496eb20657209326f211bafcf9283693192c00 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -std=c++17 -fno-exceptions
 include Makefile.rules
-CXXFLAGS += -std=c++17 -fno-exceptions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
index 8b7b61c59c094f95d46b23633cc0f9190f926cef..c7c91da728d1ed92f70476fe1ce27801532c38f2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -std=c++11 -O0
 include Makefile.rules
-CXXFLAGS += -std=c++11 -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
index 442886ce40f9fafe73635954d332442f40587115..913a52fb191c138e11599aab9d493d684ea68075 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
@@ -3,8 +3,7 @@ CXX_SOURCES := main.cpp
 # Work around "exception specification in declaration does not match previous
 # declaration" errors present in older libc++ releases. This error was fixed in
 # the 3.8 release.
-CFLAGS_EXTRAS += -fno-exceptions
+CFLAGS_EXTRAS := -fno-exceptions
 
 USE_LIBCPP := 1
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
index 3fc4d802718675c50db355e87a52edc59f930934..7eeff7407804dec335c54dab1a2c02cef10ec704 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -std=c++17
 include Makefile.rules
-CXXFLAGS += -std=c++17

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
index c7df6a4cbf9b82eda27a5e201cb176f524bc41f3..d87cf7d40278729d52d5061e0312aab445677c69 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
@@ -1,5 +1,4 @@
 CXX_SOURCES := main.cpp
 USE_LIBCPP := 1
 include Makefile.rules
-CXXFLAGS += -O0
 

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
index 4a33784693a211d19f8959a96fc086e2e14b5633..564cbada74e080ec50299623dd06e3f19aa87f76 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
@@ -1,5 +1,6 @@
 CXX_SOURCES := main.cpp
 
 USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -O0
 include Makefile.rules
-CXXFLAGS += -O0

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
index 7d43aa33e9ae7ec9d27d4bebe9a9af16342d4405..c825977b1a5dc69c18101d720a447c640b46065c 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
@@ -1,6 +1,6 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -O0
+CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
index 7d43aa33e9ae7ec9d27d4bebe9a9af16342d4405..c825977b1a5dc69c18101d720a447c640b46065c 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
@@ -1,6 +1,6 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -O0
+CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
index 7d43aa33e9ae7ec9d27d4bebe9a9af16342d4405..c825977b1a5dc69c18101d720a447c640b46065c 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
@@ -1,6 +1,6 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -O0
+CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
index 7d43aa33e9ae7ec9d27d4bebe9a9af16342d4405..c825977b1a5dc69c18101d720a447c640b46065c 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
@@ -1,6 +1,6 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -O0
+CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
index 377a1a0373a0d136f4dccb48e04f61cb92e69d5f..876340159d9c88b63220eb1e144f8b4d3334190f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
@@ -1,7 +1,8 @@
 OBJCXX_SOURCES := main.mm
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
index 377a1a0373a0d136f4dccb48e04f61cb92e69d5f..876340159d9c88b63220eb1e144f8b4d3334190f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile
@@ -1,7 +1,8 @@
 OBJCXX_SOURCES := main.mm
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
index 348edcd88b4439d40e21daf6e41a80201bdff6a9..83eb77ec8a94bffa8f0b6ab65975c0f0b57c82fd 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES := main.cpp
 
-CFLAGS_EXTRAS += -std=c++11
+CFLAGS_EXTRAS := -std=c++11
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
index 9048c7205237ebe155c21ac25d7329b6dbdea874..3767ff17e35bbf4db5e2e2532dce6b3d75755a58 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
@@ -1,10 +1,8 @@
 OBJC_SOURCES := main.m
-
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+LD_EXTRAS := -framework Foundation
 
 include Makefile.rules
 
-LDFLAGS += -framework Foundation
-
 clean::
        rm -rf $(wildcard *.o *.d *.dSYM *.log)

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
index c39b681d18704faf397a27e2abeca3ca83ce409b..4ce23f6b0fbe31a85611a5459d52e88aa887024b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
@@ -5,10 +5,10 @@ ifeq "$(OS)" ""
 endif
 
 ifeq "$(OS)" "Darwin"
-    LDFLAGS = $(CFLAGS) -Xlinker -dead_strip
+    LD_EXTRAS := -Xlinker -dead_strip
 else
-    CFLAGS += -fdata-sections -ffunction-sections
-    LDFLAGS = $(CFLAGS) -Wl,--gc-sections
+    CFLAGS_EXTRAS := -fdata-sections -ffunction-sections
+    LD_EXTRAS := -Wl,--gc-sections
 endif
 
 MAKE_DSYM := NO

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
index 62c0a39c94a4462ae8e9b8b15fbb1de1911e8d09..eb07d2fbdf3bdceba3ed69b93b5dac08ec405720 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := main.c
 
-CFLAGS_EXTRAS += -fomit-frame-pointer
+CFLAGS_EXTRAS := -fomit-frame-pointer
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
index d94874a7a05cafd82b9777b70c7d5510ab429074..362b89d7f995b32065bd0f898a0a775066154472 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
@@ -1,7 +1,8 @@
 CXX_SOURCES := calling.cpp
 
 ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
+    CXXFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile
index 5a7351146d2417e8053d3813e9bf51d312e7a026..44093101a5076eda67b84ce601c579a76dfd98e4 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -framework AppKit
+LD_EXTRAS := -lobjc -framework Foundation -framework AppKit
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
index 0c26fc7269707e2011db461ef99f39d8eb58663c..1adf3fc44a694c43f778d603d0d85b39f1105315 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
@@ -1,4 +1,5 @@
 LEVEL = ../../../make
 CXX_SOURCES := main.cpp
 include $(LEVEL)/Makefile.rules
-CXXFLAGS += -O1 -glldb -Xclang -femit-debug-entry-values
+CXXFLAGS_EXTRAS := -O1 -glldb -Xclang -femit-debug-entry-values
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile
index 41c46c6626b3ef153e2bea813aa31f531ac2df8c..48342e8e3afb9bd021125541f8380527536b5411 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+
+CXXFLAGS_EXTRAS := -g -O1 -glldb
 include Makefile.rules
-CXXFLAGS += -g -O1 -glldb

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
index 78f60047cd7878ae8d8030662258a0fe04c1226f..cd092b772561890257b7e18f6c783fbd3df5ae1e 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile
@@ -1,4 +1,5 @@
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 CXX_SOURCES := ParallelTask.cpp
 ENABLE_THREADS := YES
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile
index 1e84d63f106af609d0d01f5a5841e065f87c3849..5fd720c6d064c7ce469ffe30624b2cccaf72646b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile
@@ -1,4 +1,5 @@
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 CXX_SOURCES := main.cpp
 ENABLE_THREADS := YES
+
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
index 377a1a0373a0d136f4dccb48e04f61cb92e69d5f..876340159d9c88b63220eb1e144f8b4d3334190f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
@@ -1,7 +1,8 @@
 OBJCXX_SOURCES := main.mm
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile
index a90dc493b8c38ec95974afb3ca5e8fb28f8ba752..57083c952745659a8f3fd3328c8b358362e5d598 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -fblocks
+CFLAGS_EXTRAS := -fblocks
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile
index 47b3ca4be66a0221867e0e5bf63633a8cfdadfae..325be90d17ed0a984f1bbd567fd27deb1ca24735 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := main.c functions.c
 
-CFLAGS_EXTRAS += -O3
+CFLAGS_EXTRAS := -O3
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile
index ae2e4c45e1162cac4bc9707841a8879b737a3f96..d3998eeef9951d2a72d13f72abc1ad200ef75545 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := main.c
 
-CFLAGS_EXTRAS += -O1
+CFLAGS_EXTRAS := -O1
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
index 569979a0653ca59934c171d1104d12b7c2c94ca3..e4d42f6525d14297627b5f1e8bf315596a83ada2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := test.c
 
-CFLAGS_EXTRAS += -O1 -D_FORTIFY_SOURCE=0
+CFLAGS_EXTRAS := -O1 -D_FORTIFY_SOURCE=0
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile
index db8ac60dd1931f59e00e266a97aabbaaffd620aa..a40a666476c4397e21cac89021555851fd12d818 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -finput-charset=UTF-8 -fextended-identifiers -std=c99
+CFLAGS_EXTRAS := -finput-charset=UTF-8 -fextended-identifiers -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
index ac4b37c7c7bfa13c78be49f61c1044fcf243965c..a02c72adc202841e06cdd0bed0fe32fdc51be759 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
@@ -1,8 +1,9 @@
 CXX_SOURCES := main.cpp
 
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 
 clean: OBJECTS+=$(wildcard main.d.*)
 
-include Makefile.rules
 
+
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile
index 4a430eccc701d59a3663b5db1316e964f3d4ea61..a98dca64e8a9d550692b3a137b41cef06ac48f53 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile
@@ -1,5 +1,5 @@
 PCH_CXX_SOURCE = pch.h
 CXX_SOURCES = main.cpp
-CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS)
+CFLAGS_EXTRAS := $(MODULE_DEBUG_INFO_FLAGS)
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile
index 8e811fdeb67a59011be40358efebce37939c080a..ba7e01537522ea8c865bd6037e4f0b922028a8e6 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES = main.cpp derived.cpp base.cpp
 
-CFLAGS_EXTRAS += $(LIMIT_DEBUG_INFO_FLAGS)
+CFLAGS_EXTRAS := $(LIMIT_DEBUG_INFO_FLAGS)
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile
index 9e7837a7695380d93dc8b7c69313f25d7c7c928f..3dff43b34c774f921d3794a04b32b22ca4f1e985 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile
@@ -1,4 +1,4 @@
 CXX_SOURCES := main.cpp
-CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)/include
+CXXFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)/include
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile
index 57ee6052ae9ce7ded098c8db8f607b4719fab754..e891bb25dd91209a932b8833e0156372cf6c1f1e 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES := main.cpp
 
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 
-include Makefile.rules
\ No newline at end of file
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile
index f96dd95399ee91eb2045f2bbb0bc569d01a2e125..b016f006747dafa9ed630b6e995e1d6b1b04997b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES := main.cpp
-CXXFLAGS += -std=c++11
+CXXFLAGS_EXTRAS := -std=c++11
 USE_LIBCPP := 1
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile
index 48c06c712cdb2a63209ace7b7bc42cce9ed6df23..df76ed3069fcfcdc0bd555322d685d6b998ac717 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := ivars-in-blocks.m main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile
index 377a1a0373a0d136f4dccb48e04f61cb92e69d5f..876340159d9c88b63220eb1e144f8b4d3334190f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile
@@ -1,7 +1,8 @@
 OBJCXX_SOURCES := main.mm
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile
index b9d3a985fbe9b1f38ad0c01acac0d2be46ba1c52..cfae251ead4b0755825aa0cf71f1ee55c0b227dc 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile
@@ -2,6 +2,7 @@ DYLIB_NAME := Container
 DYLIB_OBJC_SOURCES := Container.m
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile
index 38ef76b8d5852ea3f9ae0e981968dadc3f77c6b9..e95ebd94a94aaa3a97c3824a7d8f44d23c52492a 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile
@@ -1,6 +1,7 @@
 OBJC_SOURCES := main.m my-base.m
 #OBJC_SOURCES := const-strings.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile
index 32d01e345df68aebc6208217958527be38941a85..afecbf969483e22e05704cf55ce5e8132d5cdd21 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
index 843400a08cfcead6b29f3da1c6844730bf4075d4..ba7e23acabab168f2d4d1fe92c424c8d3ad61826 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
@@ -1,18 +1,5 @@
-CC ?= clang
-ifeq "$(ARCH)" ""
-        ARCH = x86_64
-endif
-
-ifeq "$(OS)" ""
-        OS = $(shell uname -s)
-endif
-
-CFLAGS ?= -g -O0
+CFLAGS := -g -O0
 CFLAGS_NO_DEBUG = 
-ifeq "$(OS)" "Darwin"
-        CFLAGS += -arch $(ARCH)
-               CFLAGS_NO_DEBUG += -arch $(ARCH)
-endif
 
 all: aout
 

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile
index c6bd24d99ada4d1817f90b19fcae17f45a0b04d4..3b2bd504c89d67a7358b193c345be33fd03eec63 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile
@@ -1,5 +1,5 @@
 OBJC_SOURCES := main.m
 
-CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
+CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS)
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile
index c32d0fb655d06a3e9a165b5b309b08ed14a725be..abb36e281b2f927145dccb3a8167ea4874abab8b 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile
@@ -1,6 +1,5 @@
 OBJC_SOURCES := main.m myModule.m
 
+CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS)
+LD_EXTRAS := -framework Foundation
 include Makefile.rules
-
-CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
-LDFLAGS += -framework Foundation

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile
index 78d1c67dec1679704dadf122e4907e555ae21d17..b4afe2cb3e856f3b5dd9abb2668b2edc2db622d1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile
@@ -2,6 +2,6 @@ C_SOURCES := myModule.c
 
 OBJC_SOURCES := main.m
 
-include Makefile.rules
+CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)
 
-CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(PWD)
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile
index 32d01e345df68aebc6208217958527be38941a85..afecbf969483e22e05704cf55ce5e8132d5cdd21 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile
index e0c4678f5d90295fb17da3e093f87365d3223701..e6db3dee37bfa5bb7d0397a1342b0bdb54c3744e 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := class.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile
index 8677e226556816cc68d6bbe97434f83e719f363d..a34977712c3663eb538aa4bcc16860c3c0eff2d9 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := dynamic-value.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile
index 701fd53ab273d6dac3dc6688b038156b91ff1edd..5408f4199f2ad1988511bfc243134ec0167ece3f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := objc-ivar-offsets.m main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
index 32c0f4aef4086f764a9cee445e145bab5bade573..a218ce37e61df3ae6f69efad63f582b57da2bcbd 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
@@ -1,5 +1,5 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 all:        a.out.stripped
 

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile
index 9be48503826ae3718e45c8f8777b31512071bc96..5fb128dcc7e9199c07f8753dd4ffb275d4dbd81c 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile
@@ -1,6 +1,6 @@
 OBJC_SOURCES := main.m
 
 CFLAGS ?= -arch $(ARCH) -g -O2
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile
index 32d01e345df68aebc6208217958527be38941a85..afecbf969483e22e05704cf55ce5e8132d5cdd21 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
index 32d01e345df68aebc6208217958527be38941a85..afecbf969483e22e05704cf55ce5e8132d5cdd21 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
index 5ba751c1567e7b07e7f3c372a82ffc26941e8918..0ad7e3563167ff49e12e551840b42346216495fa 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
@@ -1,5 +1,5 @@
 OBJC_SOURCES := static.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 default:        a.out.stripped
 

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile
index 1c9e629925f817853001887d7142161736aa3eeb..954dea47b32ec8a15837face65ac46b02e62f763 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := static.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile
index 09e6a5ea3387d288a4d6a067f78431837b9d5d92..9906470d5308dd18f35aa9c4e62b1eceb96a26a1 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := stepping-tests.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile
index 1db77a61ecdd82d47f110917ed2097f5f49de509..d059a5c1c292efa4f13aaedd22c9ad8b2324c7dc 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := test.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile
index 1db77a61ecdd82d47f110917ed2097f5f49de509..d059a5c1c292efa4f13aaedd22c9ad8b2324c7dc 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := test.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile
index e0c4678f5d90295fb17da3e093f87365d3223701..e6db3dee37bfa5bb7d0397a1342b0bdb54c3744e 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := class.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile
index 32d01e345df68aebc6208217958527be38941a85..afecbf969483e22e05704cf55ce5e8132d5cdd21 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile
index 1d34d4ed2fff07856b3eb62196eb67dae337c8c4..2eab56265f57b049823538488c1a71104c88d1ad 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := blocked.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile
index 1b3732be2528e6d68b92cb78a145cad250801c05..f1498efac1d29b225afdeed7c00b06cc0036b2f0 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := Bar.m Foo.m main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile
index 32d01e345df68aebc6208217958527be38941a85..afecbf969483e22e05704cf55ce5e8132d5cdd21 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile
index 7202932571dc3e8ab29bd36f095e1d8298191b38..37dd8f40a9d4ac89cc2275e87b2051bb36a7fb65 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile
@@ -1,5 +1,6 @@
 OBJC_SOURCES := main.m
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile
index 7423b54218a52574f7be07191a0e8d93468fc1eb..7cfe4a3f0fdc66bb63f2665c4cffedcae7d4fb66 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile
@@ -1,4 +1,4 @@
 OBJCXX_SOURCES := main.mm
-LDFLAGS = $(CFLAGS) -lobjc -framework CoreFoundation
+LD_EXTRAS := -lobjc -framework CoreFoundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile
index c0b4b1a3470aa82657102c33754704f81ce0f7db..3af75c304c35d369ad797cf5a2d2886a97f632f2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile
@@ -1,4 +1,4 @@
 OBJCXX_SOURCES := main.mm
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile
index c0b4b1a3470aa82657102c33754704f81ce0f7db..3af75c304c35d369ad797cf5a2d2886a97f632f2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile
@@ -1,4 +1,4 @@
 OBJCXX_SOURCES := main.mm
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS := -lobjc -framework Foundation
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
index fa3eadef65f569c302ed158f5a0f00a8120af893..98042d61ea562c8e9def3ef624417762d9797d96 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
@@ -1,5 +1,5 @@
 CXX_SOURCES := main.cpp
-LD_EXTRAS += -Wl,--build-id=none
+LD_EXTRAS := -Wl,--build-id=none
 
 all: stripped.out
 

diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
index 169460598a25c56b37e79c8888f3c858538c33e9..4f3dd568d5f18a63b4d8c845b91a0dcb53b948d2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := a.c b.c
-a.o: CFLAGS_EXTRAS += -gsplit-dwarf
+a.o: CFLAGS_EXTRAS := -gsplit-dwarf
 
 include Makefile.rules
 

diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
index 357a6032bcd29bcc5e15835eacda62c7847818fc..ee67988d0650fbded86fcc094fb457fe282c3f1d 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := main.c
-LDFLAGS = $(CFLAGS) -Xlinker -order_file -Xlinker $(SRCDIR)/order-file
+LD_EXTRAS = -Xlinker -order_file -Xlinker $(SRCDIR)/order-file
 MAKE_DSYM := NO
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 94b11ec4055eba1134c5df005f747520892f8d54..5a056b1475a0c578fa745f51d6e07ba105afe5bc 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -335,7 +335,7 @@ ifeq "$(MAKE_GMODULES)" "YES"
        CXXFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
 endif
 
-CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS)
+CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS) $(CXXFLAGS_EXTRAS)
 LD = $(CC)
 LDFLAGS ?= $(CFLAGS)
 LDFLAGS += $(LD_EXTRAS) $(ARCH_LDFLAGS)

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
index b5256564c2f16271deb839c8ea2bf067ab590abb..33da5d0645ec46e2651a4e736ccd9e418acbca46 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
@@ -1,6 +1,8 @@
 CXX_SOURCES := main.cpp
 
+include Makefile.rules
+
 # Clean renamed executable on 'make clean'
-clean: OBJECTS+=no_synth
+clean::
+       $(RM) -f no_synth
 
-include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
index b5256564c2f16271deb839c8ea2bf067ab590abb..16a823213db6d2e98ce7f40e643e1a5d856cdeaf 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
@@ -1,6 +1,7 @@
 CXX_SOURCES := main.cpp
 
-# Clean renamed executable on 'make clean'
-clean: OBJECTS+=no_synth
-
 include Makefile.rules
+
+# Clean renamed executable on 'make clean'
+clean::
+       $(RM) -f no_synth

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile
index 4cb3dc98c8c1e3b9dabc8bee7db8641ddb31400e..e6d9d8310a0fa83f7fa0a9c966cb7eeec9518706 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile
@@ -1,7 +1,7 @@
 C_SOURCES := inlines.c
 
 ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
+    CFLAGS_EXTRAS := -debug inline-debug-info
 endif
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile
index 200bdafd69fe42770ad0fa37c460ad12e3e1861e..4d11bbc8b6a058a3bd5b7802d2ef604352720d73 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile
@@ -1,4 +1,4 @@
-CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS
 ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 MAKE_DSYM := NO

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile
index 938161724be55fae3e39b624a2428d0e20cdfa7c..6b33049a78bdd6905d7b6000c87ecb6707292d09 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile
@@ -1,4 +1,4 @@
-CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS
 ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 MAKE_DSYM :=NO

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile
index 5eed4cb698c425bb23764bd7a1005c8723d69c6f..79209db9696aafba54df619d52a3d50ca66574e7 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile
@@ -1,4 +1,4 @@
-CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS
 ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp b.cpp c.cpp
 MAKE_DSYM :=NO

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile
index 03b578913862cf3ddfcbe0ce95bb077a1e9afde8..8b322ff320bb04f29bf064834be0c8267925ffa2 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile
@@ -1,7 +1,8 @@
 OBJC_SOURCES := main.m
 
-CFLAGS_EXTRAS += -w
+CFLAGS_EXTRAS := -w
+
 
-include Makefile.rules
 
-LDFLAGS += -framework Foundation
+LD_EXTRAS := -framework Foundation
+include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile
index 95cdf295fbcf9c58ac6a69f8a49060e7e636df58..3716c6e29e9900bfb95b3909dcbe1cca34a42e8c 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile
@@ -1,5 +1,5 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 # See TestHelloWorld.py, which specifies the executable name with a dictionary.
 EXE := hello_world
 

diff --git a/lldb/packages/Python/lldbsuite/test/sample_test/Makefile b/lldb/packages/Python/lldbsuite/test/sample_test/Makefile
index aa5f222c08e3167c8cbc254258eb51396a4d7230..695335e068c0c92372578f62a4750f7cabad8468 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/sample_test/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/sample_test/Makefile
@@ -1,4 +1,4 @@
 C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
+CFLAGS_EXTRAS := -std=c99
 
 include Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile
index 1e0987a3022b04e81ed27f695d3bb44bcc94f81d..0c441eda98b2ea71384294c3eface1f0c6f5b664 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile
@@ -1,4 +1,4 @@
-override CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
 ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 MAKE_DSYM :=NO

diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile
index 7fe9a3e92a740ef51c5ff4b57b13326341f205e6..536d2e8db48c52367937d90c45d68d5b826b0164 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile
@@ -1,4 +1,4 @@
-CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11
 # LD_EXTRAS := -lpthread
 CXX_SOURCES := main.cpp
 MAKE_DSYM :=NO