Author: flackr Date: Tue Mar 24 07:41:20 2015 New Revision: 233066 URL: http://llvm.org/viewvc/llvm-project?rev=233066&view=rev Log: Don't clobber CFLAGS_EXTRAS in tests.
To run tests against a different target platform many extra compiler flags are needed to specify sysroot, include dirs, etc. The environment variable CFLAGS_EXTRAS seems suited for this purpose except that several Makefiles clobber the current flags. This change modifies all of these to add to CFLAGS_EXTRAS instead. Test Plan: Verify no regressions in ninja check-lldb. Run tests using CFLAGS_EXTRAS to specify cross compilation flags for a different target running lldb-server platform. Differential Revision: http://reviews.llvm.org/D8559 Modified: lldb/trunk/test/expression_command/call-function/Makefile lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/Makefile lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Makefile lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Makefile lldb/trunk/test/functionalities/data-formatter/stringprinter/Makefile lldb/trunk/test/lang/cpp/stl/Makefile lldb/trunk/test/make/Makefile.rules lldb/trunk/test/python_api/lldbutil/iter/Makefile lldb/trunk/test/python_api/lldbutil/process/Makefile lldb/trunk/test/python_api/module_section/Makefile lldb/trunk/test/python_api/sbvalue_persist/Makefile lldb/trunk/test/python_api/value_var_update/Makefile lldb/trunk/test/tools/lldb-server/Makefile lldb/trunk/test/tools/lldb-server/inferior-crash/Makefile Modified: lldb/trunk/test/expression_command/call-function/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-function/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/expression_command/call-function/Makefile (original) +++ lldb/trunk/test/expression_command/call-function/Makefile Tue Mar 24 07:41:20 2015 @@ -6,7 +6,7 @@ CXX_SOURCES := main.cpp # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/Makefile (original) +++ lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/Makefile Tue Mar 24 07:41:20 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make C_SOURCES := main.c -CFLAGS_EXTRAS := -std=c99 +CFLAGS_EXTRAS += -std=c99 include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile Tue Mar 24 07:41:20 2015 @@ -6,7 +6,7 @@ CXX_SOURCES := main.cpp # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile Tue Mar 24 07:41:20 2015 @@ -2,14 +2,14 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp -CFLAGS_EXTRAS := -O0 +CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile Tue Mar 24 07:41:20 2015 @@ -2,7 +2,7 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp -CFLAGS_EXTRAS := -O0 +CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile Tue Mar 24 07:41:20 2015 @@ -2,7 +2,7 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp -CFLAGS_EXTRAS := -O0 +CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile Tue Mar 24 07:41:20 2015 @@ -2,7 +2,7 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp -CFLAGS_EXTRAS := -O0 +CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/Makefile Tue Mar 24 07:41:20 2015 @@ -6,7 +6,7 @@ CXX_SOURCES := main.cpp # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Makefile Tue Mar 24 07:41:20 2015 @@ -5,7 +5,7 @@ CXX_SOURCES := main.cpp # Workaround for llvm.org/pr16214: clang doesn't emit structure definition DWARF # information without the flag below. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Makefile Tue Mar 24 07:41:20 2015 @@ -6,7 +6,7 @@ CXX_SOURCES := main.cpp # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/stringprinter/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/stringprinter/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/stringprinter/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/stringprinter/Makefile Tue Mar 24 07:41:20 2015 @@ -6,7 +6,7 @@ CXXFLAGS += -std=c++11 # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/lang/cpp/stl/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/stl/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/lang/cpp/stl/Makefile (original) +++ lldb/trunk/test/lang/cpp/stl/Makefile Tue Mar 24 07:41:20 2015 @@ -9,7 +9,7 @@ clean: OBJECTS+=$(wildcard main.d.*) # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/make/Makefile.rules (original) +++ lldb/trunk/test/make/Makefile.rules Tue Mar 24 07:41:20 2015 @@ -14,7 +14,7 @@ # # Also might be of interest: # FRAMEWORK_INCLUDES (Darwin only) := -# CFLAGS_EXTRAS := +# CFLAGS_EXTRAS += # LD_EXTRAS := # SPLIT_DEBUG_SYMBOLS := YES # Modified: lldb/trunk/test/python_api/lldbutil/iter/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/lldbutil/iter/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/python_api/lldbutil/iter/Makefile (original) +++ lldb/trunk/test/python_api/lldbutil/iter/Makefile Tue Mar 24 07:41:20 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make -CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS +CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM := NO Modified: lldb/trunk/test/python_api/lldbutil/process/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/lldbutil/process/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/python_api/lldbutil/process/Makefile (original) +++ lldb/trunk/test/python_api/lldbutil/process/Makefile Tue Mar 24 07:41:20 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make -CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS +CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO Modified: lldb/trunk/test/python_api/module_section/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/module_section/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/python_api/module_section/Makefile (original) +++ lldb/trunk/test/python_api/module_section/Makefile Tue Mar 24 07:41:20 2015 @@ -1,6 +1,6 @@ LEVEL = ../../make -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 Modified: lldb/trunk/test/python_api/sbvalue_persist/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/sbvalue_persist/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/python_api/sbvalue_persist/Makefile (original) +++ lldb/trunk/test/python_api/sbvalue_persist/Makefile Tue Mar 24 07:41:20 2015 @@ -9,7 +9,7 @@ clean: OBJECTS+=no_synth # targets. Other targets do not, which causes this test to fail. # This flag enables FullDebugInfo for all targets. ifneq (,$(findstring clang,$(CC))) - CFLAGS_EXTRAS := -fno-limit-debug-info + CFLAGS_EXTRAS += -fno-limit-debug-info endif include $(LEVEL)/Makefile.rules Modified: lldb/trunk/test/python_api/value_var_update/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value_var_update/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/python_api/value_var_update/Makefile (original) +++ lldb/trunk/test/python_api/value_var_update/Makefile Tue Mar 24 07:41:20 2015 @@ -1,7 +1,7 @@ LEVEL = ../../make 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 Modified: lldb/trunk/test/tools/lldb-server/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-server/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/tools/lldb-server/Makefile (original) +++ lldb/trunk/test/tools/lldb-server/Makefile Tue Mar 24 07:41:20 2015 @@ -1,6 +1,6 @@ LEVEL = ../../make -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 Modified: lldb/trunk/test/tools/lldb-server/inferior-crash/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-server/inferior-crash/Makefile?rev=233066&r1=233065&r2=233066&view=diff ============================================================================== --- lldb/trunk/test/tools/lldb-server/inferior-crash/Makefile (original) +++ lldb/trunk/test/tools/lldb-server/inferior-crash/Makefile Tue Mar 24 07:41:20 2015 @@ -1,6 +1,6 @@ LEVEL = ../../../make -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 _______________________________________________ lldb-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
