diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lang')
140 files changed, 140 insertions, 402 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +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 752b7aed397..a90dc493b8c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -fblocks -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile index 979cefe9b7f..59778ab5d9f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LD_EXTRAS := -L. -LOne -l$(LIB_PREFIX)One -LTwo -l$(LIB_PREFIX)Two C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: a.out: lib_One lib_Two diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk index 130c7dd511b..18f3725d22f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk @@ -1,10 +1,8 @@ -LEVEL := ../../../make - DYLIB_NAME := One DYLIB_C_SOURCES := One.c OneConstant.c DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules OneConstant.o: OneConstant.c $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk index ebe58cc743f..79b256a0e85 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk @@ -1,10 +1,8 @@ -LEVEL := ../../../make - DYLIB_NAME := Two DYLIB_C_SOURCES := Two.c TwoConstant.c DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules TwoConstant.o: TwoConstant.c $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ 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 51adad1d062..47b3ca4be66 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c functions.c CFLAGS_EXTRAS += -O3 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile index 1db43ab479b..472e733aaad 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c foo.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile index b1b77dacc01..7b94b6556f2 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - C_SOURCES := main.c DYLIB_NAME := a DYLIB_C_SOURCES := a.c -include $(LEVEL)/Makefile.rules +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 fd720188658..ae2e4c45e11 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -O1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +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 a98622100ff..569979a0653 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := test.c CFLAGS_EXTRAS += -O1 -D_FORTIFY_SOURCE=0 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile index 35d712c3f17..5e26f2748c0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - DYLIB_NAME := foo DYLIB_C_SOURCES := foo.c C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile index 6d1f1071bf2..f3285de39e0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := foo DYLIB_C_SOURCES := foo.c C_SOURCES := main.c SPLIT_DEBUG_SYMBOLS = YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile index cd9ca5c86d8..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile index 0faad10b24a..b26ce5c8b14 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c DYLIB_NAME := a @@ -7,4 +5,4 @@ DYLIB_C_SOURCES := a.c ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +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 efabc4d4335..db8ac60dd19 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -finput-charset=UTF-8 -fextended-identifiers -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile index b09a579159d..10495940055 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile index 1d1f38f7fd0..6afea39f81c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := nested.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile index 38d1625c615..dc53622129f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp a.cpp CFLAGS_EXTRAS = $(MANDATORY_CXXMODULE_BUILD_CFLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile index 932046f2696..64fd6effcee 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS :=-g -O0 -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile index 444da5fae9c..c69bf503a34 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS := -std=c++2a -fchar8_t -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile index 52a92c0b61a..b5d2d900f90 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile @@ -1,7 +1,6 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules cleanup: rm -f Makefile *.d diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile index 8770b2343ef..2bba8e757f7 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := pass-to-base.cpp -include $(LEVEL)/Makefile.rules +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 0e0f5d1dad3..ac4b37c7c7b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile index a6bd8463ad5..edb53da7b8e 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := exceptions.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile index 0497d78fec3..9826dd4af44 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp # CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS) -include $(LEVEL)/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 da6f39a7488..4a430eccc70 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - PCH_CXX_SOURCE = pch.h CXX_SOURCES = main.cpp CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile index 2ce96e90d2d..769920c2833 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp length.cpp a.cpp CFLAGS_LIMIT = -c $(CXXFLAGS) @@ -32,4 +30,4 @@ a.o: a.cpp clean: OBJECTS += limit nolimit length_limit.o length_nolimit.o length_limit.dwo length_nolimit.dwo -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile index 8f67abdf2b3..055e318e220 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := inlines.cpp -include $(LEVEL)/Makefile.rules +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 b9a3d3fe1c8..8e811fdeb67 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,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp derived.cpp base.cpp CFLAGS_EXTRAS += $(LIMIT_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile index aae93a20b9c..f78d6a76780 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules
\ No newline at end of file +include Makefile.rules
\ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile index 35eb63f922f..82f96b62609 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp -include $(LEVEL)/Makefile.rules +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 2b8f23bcec7..9e7837a7695 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)/include -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile index 7dd5eb4c11f..638974fafd6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ns.cpp ns2.cpp ns3.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile index 9e52bacd5fc..a8ed4b5ecf1 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LD_EXTRAS := -L. -l$(LIB_PREFIX)a -l$(LIB_PREFIX)b CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: a.out: lib_a lib_b diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk index e53570873a3..b214267c062 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk index 54a1d8dea5a..7fc442d2ae0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := b DYLIB_CXX_SOURCES := b.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile index bd8116b91c3..80b3ee02c3e 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES = a.cpp b.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.o: a.cpp $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile index a8d5c4eb026..1185ed0c1e8 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp static-a.cpp static-b.cpp -include $(LEVEL)/Makefile.rules +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 3a1d8a57935..57ee6052ae9 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules
\ No newline at end of file +include Makefile.rules
\ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +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 a42bb089d15..f96dd95399e 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,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile index fe27980afe9..a4b03ae0aab 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile index 1476447db35..bf443d855ce 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile index fe27980afe9..a4b03ae0aab 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile b/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile index 860343ee907..12db32c506f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := foo.cpp C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +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 0af83591826..48c06c712cd 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := ivars-in-blocks.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile index 346fc4b1fbc..e079ba94e38 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - LD_EXTRAS = -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules all: a.out diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk index be758ac07d8..7c36e32ac9d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../make - DYLIB_NAME := Test DYLIB_ONLY := YES CFLAGS_EXTRAS = -I$(SRCDIR)/.. @@ -7,4 +5,4 @@ LD_EXTRAS = -lobjc -framework Foundation DYLIB_OBJC_SOURCES = Test/Test.m -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk index 285d7262ce8..5455a856e50 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../make - DYLIB_NAME := TestExt DYLIB_ONLY := YES CFLAGS_EXTRAS = -I$(SRCDIR)/.. @@ -7,4 +5,4 @@ LD_EXTRAS = -L. -lTest -lobjc -framework Foundation DYLIB_OBJC_SOURCES = TestExt/TestExt.m -include $(LEVEL)/Makefile.rules +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 261658b10ae..377a1a0373a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation 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 b99925b50b3..b9d3a985fbe 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := Container DYLIB_OBJC_SOURCES := Container.m OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile index ce2ccd28321..38ef76b8d58 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m my-base.m #OBJC_SOURCES := const-strings.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation 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 a1608fe5a66..32d01e345df 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile index 1768d11ca27..0664769456e 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := InternalDefiner DYLIB_OBJC_SOURCES := InternalDefiner.m OBJC_SOURCES := main.m LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +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 f69da9a64be..843400a08cf 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CC ?= clang ifeq "$(ARCH)" "" ARCH = x86_64 @@ -25,4 +23,4 @@ aout: clean:: rm -f myclass.o -include $(LEVEL)/Makefile.rules +include Makefile.rules 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 ca099e1e961..c6bd24d99ad 100644 --- 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,6 +1,5 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile index 00cb9b6be34..d0aadc1af9e 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +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 b8462bc818c..c32d0fb655d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m myModule.m -include $(LEVEL)/Makefile.rules +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 320e13ed5c5..78d1c67dec1 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - C_SOURCES := myModule.c OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(PWD) diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile index ad3cb3fadcd..7202932571d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile index 910d4943ef0..e8a4b0cc29c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile index 7f7baeb3cf1..ad28ecfeb5d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LD_EXTRAS = -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile index 314f1cb2f07..99998b20bcb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +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 a1608fe5a66..32d01e345df 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 c2d07910a6e..e0c4678f5d9 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := class.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile index dd909afba21..9ff3ce6e4a5 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LD_EXTRAS = -framework Foundation 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 a981f4b9035..8677e226556 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := dynamic-value.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 fdd3b5ebfa9..701fd53ab27 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := objc-ivar-offsets.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 b93a8a13379..32c0f4aef40 100644 --- 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,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation @@ -12,4 +10,4 @@ clean:: rm -f a.out.stripped rm -rf a.out.stripped.dSYM -include $(LEVEL)/Makefile.rules +include Makefile.rules 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 ad3cb3fadcd..7202932571d 100644 --- 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,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation 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 aa6a7520525..9be48503826 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS ?= -arch $(ARCH) -g -O2 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 a1608fe5a66..32d01e345df 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 a1608fe5a66..32d01e345df 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 6c5492dade1..5ba751c1567 100644 --- 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,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := static.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation @@ -13,4 +11,4 @@ clean:: rm -f a.out.stripped rm -rf $(wildcard *.dSYM) -include $(LEVEL)/Makefile.rules +include Makefile.rules 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 a8e973f6d3b..1c9e629925f 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := static.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 b097fe65fce..09e6a5ea338 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := stepping-tests.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 c16802966cf..1db77a61ecd 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := test.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 c16802966cf..1db77a61ecd 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := test.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 c2d07910a6e..e0c4678f5d9 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := class.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 a1608fe5a66..32d01e345df 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 dba1065cd71..1d34d4ed2ff 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := blocked.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile index b05ff34b739..845553d5e3f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +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 ad3cb3fadcd..7202932571d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation 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 ad3cb3fadcd..7202932571d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation 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 ad3cb3fadcd..7202932571d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile index 385b557c9af..919000e6402 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules ifneq (,$(findstring arm,$(ARCH))) LD_EXTRAS = -framework Foundation -framework UIKit 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 61cc3b3b6db..1b3732be252 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := Bar.m Foo.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 a1608fe5a66..32d01e345df 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile index bdae30428be..644046c69ea 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LD_EXTRAS ?= -framework Foundation -include $(LEVEL)/Makefile.rules +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 ad3cb3fadcd..7202932571d 100644 --- 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,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile index 57da077c862..bae88debbb1 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile @@ -1,6 +1,5 @@ -LEVEL = ../../../make OBJCXX_SOURCES := main.mm myobject.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS_NO_DEBUG = ifeq "$(OS)" "Darwin" CFLAGS_NO_DEBUG += -arch $(ARCH) 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 c258c4de49e..7423b54218a 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework CoreFoundation -include $(LEVEL)/Makefile.rules +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 edd3430de7c..c0b4b1a3470 100644 --- 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,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +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 edd3430de7c..c0b4b1a3470 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules |
