This is an archive of the discontinued LLVM Phabricator instance.

Differential D8559

Don't clobber CFLAGS_EXTRAS in tests.
ClosedPublic

Authored by flackr on Mar 23 2015, 11:27 AM.

Details

Reviewers
clayborg
Commits
rG666a98683911: Don't clobber CFLAGS_EXTRAS in tests.
rLLDB233066: Don't clobber CFLAGS_EXTRAS in tests.
rL233066: Don't clobber CFLAGS_EXTRAS in tests.
Summary

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.

Diff Detail

Repository
rL LLVM

Event Timeline

flackr updated this revision to Diff 22494.Mar 23 2015, 11:27 AM
flackr retitled this revision from to Don't clobber CFLAGS_EXTRAS in tests..
flackr updated this object.
flackr edited the test plan for this revision. (Show Details)
flackr added a reviewer: clayborg.
flackr set the repository for this revision to rL LLVM.
flackr added a subscriber: Unknown Object (MLST).
clayborg accepted this revision.Mar 23 2015, 11:37 AM
clayborg edited edge metadata.

lgtm

This revision is now accepted and ready to land.Mar 23 2015, 11:37 AM
Closed by commit rL233066: Don't clobber CFLAGS_EXTRAS in tests. (authored by flackr). · Explain WhyMar 24 2015, 5:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
test/
expression_command/
call-function/
2 lines
functionalities/
breakpoint/
breakpoint_conditions/
2 lines
data-formatter/
data-formatter-skip-summary/
2 lines
data-formatter-stl/
libstdcpp/
iterator/
4 lines
list/
2 lines
string/
2 lines
vbool/
2 lines
data-formatter-synth/
2 lines
rdar-9973865/
2 lines
rdar-9974002/
2 lines
stringprinter/
2 lines
lang/
cpp/
stl/
2 lines
make/
2 lines
python_api/
lldbutil/
iter/
2 lines
process/
2 lines
module_section/
2 lines
sbvalue_persist/
2 lines
value_var_update/
2 lines
tools/
lldb-server/
2 lines
inferior-crash/
2 lines

Diff 22557

lldb/trunk/test/expression_command/call-function/Makefile

LEVEL = ../../make LEVEL = ../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules
clean:: clean::
rm -rf *.o *.d *.dSYM rm -rf *.o *.d *.dSYM

lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/Makefile

LEVEL = ../../../make LEVEL = ../../../make
C_SOURCES := main.c C_SOURCES := main.c
CFLAGS_EXTRAS := -std=c99 CFLAGS_EXTRAS += -std=c99
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules
CXXFLAGS += -O0 CXXFLAGS += -O0
ifeq (,$(findstring gcc,$(CC))) ifeq (,$(findstring gcc,$(CC)))
CXXFLAGS += -stdlib=libstdc++ CXXFLAGS += -stdlib=libstdc++
LDFLAGS += -stdlib=libstdc++ LDFLAGS += -stdlib=libstdc++
endif endif

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile

LEVEL = ../../../../../make LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
CFLAGS_EXTRAS := -O0 CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1 USE_LIBSTDCPP := 1
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile

LEVEL = ../../../../../make LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
CFLAGS_EXTRAS := -O0 CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1 USE_LIBSTDCPP := 1
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile

LEVEL = ../../../../../make LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
CFLAGS_EXTRAS := -O0 CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1 USE_LIBSTDCPP := 1
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile

LEVEL = ../../../../../make LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
CFLAGS_EXTRAS := -O0 CFLAGS_EXTRAS += -O0
USE_LIBSTDCPP := 1 USE_LIBSTDCPP := 1
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
# Workaround for llvm.org/pr16214: clang doesn't emit structure definition DWARF # Workaround for llvm.org/pr16214: clang doesn't emit structure definition DWARF
# information without the flag below. # information without the flag below.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/data-formatter/stringprinter/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11 CXXFLAGS += -std=c++11
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/lang/cpp/stl/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
CFLAGS := -g -O0 CFLAGS := -g -O0
clean: OBJECTS+=$(wildcard main.d.*) clean: OBJECTS+=$(wildcard main.d.*)
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/make/Makefile.rules

#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Clients fill in the source files to build # Clients fill in the source files to build
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# C_SOURCES := main.c # C_SOURCES := main.c
# CXX_SOURCES := # CXX_SOURCES :=
# OBJC_SOURCES := # OBJC_SOURCES :=
# OBJCXX_SOURCES := # OBJCXX_SOURCES :=
# DYLIB_C_SOURCES := # DYLIB_C_SOURCES :=
# DYLIB_CXX_SOURCES := # DYLIB_CXX_SOURCES :=
# #
# Specifying DYLIB_ONLY has the effect of building dylib only, skipping # Specifying DYLIB_ONLY has the effect of building dylib only, skipping
# the building of the a.out executable program. For example, # the building of the a.out executable program. For example,
# DYLIB_ONLY := YES # DYLIB_ONLY := YES
# #
# Also might be of interest: # Also might be of interest:
# FRAMEWORK_INCLUDES (Darwin only) := # FRAMEWORK_INCLUDES (Darwin only) :=
# CFLAGS_EXTRAS := # CFLAGS_EXTRAS +=
# LD_EXTRAS := # LD_EXTRAS :=
# SPLIT_DEBUG_SYMBOLS := YES # SPLIT_DEBUG_SYMBOLS := YES
# #
# And test/functionalities/archives/Makefile: # And test/functionalities/archives/Makefile:
# MAKE_DSYM := NO # MAKE_DSYM := NO
# ARCHIVE_NAME := libfoo.a # ARCHIVE_NAME := libfoo.a
# ARCHIVE_C_SOURCES := a.c b.c # ARCHIVE_C_SOURCES := a.c b.c
▲ Show 20 Lines • Show All 471 Lines • Show Last 20 Lines

lldb/trunk/test/python_api/lldbutil/iter/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS
ENABLE_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
MAKE_DSYM := NO MAKE_DSYM := NO
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/python_api/lldbutil/process/Makefile

LEVEL = ../../../make LEVEL = ../../../make
CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS
ENABLE_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
MAKE_DSYM :=NO MAKE_DSYM :=NO
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/python_api/module_section/Makefile

LEVEL = ../../make LEVEL = ../../make
CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS
ENABLE_THREADS := YES ENABLE_THREADS := YES
CXX_SOURCES := main.cpp b.cpp c.cpp CXX_SOURCES := main.cpp b.cpp c.cpp
MAKE_DSYM :=NO MAKE_DSYM :=NO
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/python_api/sbvalue_persist/Makefile

LEVEL = ../../make LEVEL = ../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
# Clean renamed executable on 'make clean' # Clean renamed executable on 'make clean'
clean: OBJECTS+=no_synth clean: OBJECTS+=no_synth
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail. # targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets. # This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS := -fno-limit-debug-info CFLAGS_EXTRAS += -fno-limit-debug-info
endif endif
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/python_api/value_var_update/Makefile

LEVEL = ../../make LEVEL = ../../make
C_SOURCES := main.c C_SOURCES := main.c
CFLAGS_EXTRAS := -std=c99 CFLAGS_EXTRAS += -std=c99
# See TestHelloWorld.py, which specifies the executable name with a dictionary. # See TestHelloWorld.py, which specifies the executable name with a dictionary.
EXE := hello_world EXE := hello_world
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/tools/lldb-server/Makefile

LEVEL = ../../make 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 ENABLE_THREADS := YES
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
MAKE_DSYM :=NO MAKE_DSYM :=NO
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules

lldb/trunk/test/tools/lldb-server/inferior-crash/Makefile

LEVEL = ../../../make 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 # LD_EXTRAS := -lpthread
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
MAKE_DSYM :=NO MAKE_DSYM :=NO
include $(LEVEL)/Makefile.rules include $(LEVEL)/Makefile.rules