[Lldb-commits] [lldb] [LLDB] Simplify Makefile (PR #225890)

[via lldb-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Adrian Prantl (adrian-prantl)

<details>
<summary>Changes</summary>



---
Full diff: https://github.com/llvm/llvm-project/pull/225890.diff


1 Files Affected:

- (modified) lldb/test/API/macosx/branch-islands/Makefile (+8-10) 


``````````diff
diff --git a/lldb/test/API/macosx/branch-islands/Makefile b/lldb/test/API/macosx/branch-islands/Makefile
index d7bfb33da00730..8c663634318529 100644
--- a/lldb/test/API/macosx/branch-islands/Makefile
+++ b/lldb/test/API/macosx/branch-islands/Makefile
@@ -1,16 +1,14 @@
-C_SOURCES := main.c foo.c
+C_SOURCES := main.c
 CFLAGS_EXTRAS := -std=c99
+# Link foo.o after the padding so that main's call to foo needs a branch island.
+LD_EXTRAS := padding1.o padding2.o padding3.o padding4.o foo.o
 
 include Makefile.rules
 
-a.out: main.o padding1.o padding2.o padding3.o padding4.o foo.o
-	${CC} ${LDFLAGS} foo.o padding1.o padding2.o padding3.o padding4.o main.o -o a.out
+a.out: $(LD_EXTRAS)
 
-%.o: $(SRCDIR)/%.s
-	${CC} ${CFLAGS} -c $<
+foo.o: foo.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-#padding1.o: padding1.s
-#	${CC} -c $(SRCDIR)/padding1.s
-
-#padding2.o: padding2.s
-#	${CC} -c $(SRCDIR)/padding2.s
+%.o: %.s
+	$(CC) $(CFLAGS) -c -o $@ $<

``````````

</details>


https://github.com/llvm/llvm-project/pull/225890