summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/lang/objc
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lang/objc')
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile3
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile4
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile4
45 files changed, 45 insertions, 133 deletions
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
OpenPOWER on IntegriCloud