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/lang/cpp | |
| 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/lang/cpp')
6 files changed, 9 insertions, 8 deletions
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 ac4b37c7c7b..a02c72adc20 100644 --- 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 4a430eccc70..a98dca64e8a 100644 --- 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 8e811fdeb67..ba7e0153752 100644 --- 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 9e7837a7695..3dff43b34c7 100644 --- 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 57ee6052ae9..e891bb25dd9 100644 --- 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 f96dd95399e..b016f006747 100644 --- 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 |
