diff options
| author | Adrian Prantl <aprantl@apple.com> | 2019-09-25 00:36:00 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2019-09-25 00:36:00 +0000 |
| commit | 5c4c9e61725526e1e7afca87b395a0efd2aeabfd (patch) | |
| tree | 174ed56ba52ef911ec05e5f15d607a5004c34eca /lldb/packages/Python/lldbsuite/test/functionalities | |
| parent | 24f63176342dabc35582cb9e7574d288c7779272 (diff) | |
| download | bcm5719-llvm-5c4c9e61725526e1e7afca87b395a0efd2aeabfd.tar.gz bcm5719-llvm-5c4c9e61725526e1e7afca87b395a0efd2aeabfd.zip | |
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
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities')
66 files changed, 139 insertions, 98 deletions
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 aa5f222c08e..695335e068c 100644 --- 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 aa5f222c08e..695335e068c 100644 --- 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 b6309174c4c..ad42b20df4e 100644 --- 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 aa5f222c08e..695335e068c 100644 --- 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 56bf159ec07..2c00681fa22 100644 --- 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 f25c0ea8055..9645fd9cc8d 100644 --- 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 56bf159ec07..2c00681fa22 100644 --- 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 56bf159ec07..2c00681fa22 100644 --- 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 f25c0ea8055..9645fd9cc8d 100644 --- 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 7202932571d..37dd8f40a9d 100644 --- 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 f25c0ea8055..9645fd9cc8d 100644 --- 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 aa5f222c08e..695335e068c 100644 --- 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 56bf159ec07..2c00681fa22 100644 --- 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 377a1a0373a..876340159d9 100644 --- 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 86bbe461026..a537b994079 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 720d1b1ca5a..6bfb97cd2c2 100644 --- 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 22307c41c1c..b016f006747 100644 --- 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 22307c41c1c..b016f006747 100644 --- 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 29c68ae5740..e78030cbf75 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 5ad5241858d..23496eb2065 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 8b7b61c59c0..c7c91da728d 100644 --- 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 442886ce40f..913a52fb191 100644 --- 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 3fc4d802718..7eeff740780 100644 --- 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 c7df6a4cbf9..d87cf7d4027 100644 --- 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 4a33784693a..564cbada74e 100644 --- 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 7d43aa33e9a..c825977b1a5 100644 --- 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 7d43aa33e9a..c825977b1a5 100644 --- 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 7d43aa33e9a..c825977b1a5 100644 --- 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 7d43aa33e9a..c825977b1a5 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 03b57891386..8b322ff320b 100644 --- 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 377a1a0373a..876340159d9 100644 --- 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 377a1a0373a..876340159d9 100644 --- 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 348edcd88b4..83eb77ec8a9 100644 --- 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 9048c720523..3767ff17e35 100644 --- 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 c39b681d187..4ce23f6b0fb 100644 --- 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 62c0a39c94a..eb07d2fbdf3 100644 --- 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 d94874a7a05..362b89d7f99 100644 --- 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 5a7351146d2..44093101a50 100644 --- 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 0c26fc72697..1adf3fc44a6 100644 --- 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 7202932571d..37dd8f40a9d 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 41c46c6626b..48342e8e3af 100644 --- 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 78f60047cd7..cd092b77256 100644 --- 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 1e84d63f106..5fd720c6d06 100644 --- 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 377a1a0373a..876340159d9 100644 --- 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 |
