Update test Makefile for upstream Makefile.rules changes

The whole ARCHIVE facility, which was only used by a single test, has
been removed by https://reviews.llvm.org/D94890.

rdar://82038349

Author: adrian-prantl

lldb/test/API/lang/swift/parseable_interfaces/static/Makefile

@@ -21,20 +21,23 @@ staticA:
 	# Because we override VPATH to point to the build directory, we need to pass
 	# down SWIFTC too (it's default value is relative to VPATH)
 	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
-		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
+		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) \
+		SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=AA -f $(SRCDIR)/libs/Makefile static_only
 
 staticB:
 	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
-		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
+		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) \
+		SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=BB SWIFTFLAGS_EXTRAS="-I$(BUILDDIR)" \
 		LD_EXTRAS="-L$(BUILDDIR)" -f $(SRCDIR)/libs/Makefile static_only
 
 staticC:
 	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
-		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
+		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) \
+		SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=CC -f $(SRCDIR)/libs/Makefile static_only
 

lldb/test/API/lang/swift/parseable_interfaces/static/libs/Makefile

@@ -3,26 +3,24 @@
 DYLIB_NAME := $(BASENAME)
 DYLIB_SWIFT_SOURCES := libs/$(BASENAME).swift
 
-# Don't use the default swift flags, as we don't want -g for the libraries in
-# this test.
-SWIFTFLAGS=-Onone -Xfrontend -serialize-debugging-options -parse-as-library -enable-library-evolution
+# Don't use -g for the libraries in this test.
+DEBUG_INFO_FLAG :=
+SWIFTFLAGS_EXTRAS := -enable-library-evolution
 
 # Don't include the wrapped .swiftmodule on Linux to make sure we use
 # the .swiftinterface. The issue here is that if the .swiftmodule is wrapped
 # and linked into the library, LLDB may find it there and load it before the
 # .swiftinterface loading path can be exercised.
 EXCLUDE_WRAPPED_SWIFTMODULE=1
 
-# Activates the rules for generating a static lib based on the .o files
-# corresponding to the dylib swift sources above.
-ARCHIVE_NAME := lib$(BASENAME).a
-ARCHIVE_OBJECTS = $(strip $(DYLIB_SWIFT_SOURCES:.swift=.o))
-
-$(ARCHIVE_NAME): $(BASENAME).swiftmodule
-
 include Makefile.rules
 
-# Generate only the static lib (all would generate a dylib as well).
+# These are *not* Makefile.rules config variables.
+ARCHIVE_NAME := lib$(BASENAME).a
+ARCHIVE_OBJECTS := $(strip $(DYLIB_SWIFT_SOURCES:.swift=.o))
+$(ARCHIVE_NAME): $(ARCHIVE_OBJECTS) $(BASENAME).swiftmodule
+	$(AR) $(ARFLAGS) $@ $<
+
 static_only: $(ARCHIVE_NAME)
 
 clean::