vendor/lldb/lldb-trunk-r338150

2 files changed, 4 insertions, 27 deletions

diff --git a/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile b/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
index 93f2f7b2f340..0d70f2595019 100644
--- a/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
+++ b/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
@@ -1,28 +1,5 @@
-CC ?= clang
-ifeq "$(ARCH)" ""
-	ARCH = x86_64
-endif
+LEVEL = ../../make
 
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
-endif
+C_SOURCES := main.c
 
-CFLAGS ?= -g -O0
-CWD := $(shell pwd)
-
-LIB_PREFIX := lib
-
-ifeq "$(OS)" "Darwin"
-	CFLAGS += -arch $(ARCH)
-endif
-
-all: a.out
-
-a.out: main.o
-	$(CC) $(CFLAGS) -o a.out main.o
-
-main.o: main.c
-	$(CC) $(CFLAGS) -c main.c
-
-clean:
-	rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM)
+include $(LEVEL)/Makefile.rules
diff --git a/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
index 096064896eaa..314084d0b158 100644
--- a/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
@@ -26,7 +26,7 @@ class TestSafeFuncCalls(TestBase):
     def test_with_python_api(self):
         """Test function call thread safety."""
         self.build()
-        exe = os.path.join(os.getcwd(), "a.out")
+        exe = self.getBuildArtifact("a.out")
 
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)