Skip to content

Commit e346018

Browse files
committed
fix: find libs after compilation lol
1 parent 2c85f9b commit e346018

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@ LLVM_REPO_DIR ?= ~/SwiftProject/llvm-project
1212
SWIFT_LLVM_BUILD_DIR ?= ~/SwiftProject/build/LLVMClangSwift_iphoneos/llvm-iphoneos-arm64
1313
SWIFT_TOOLCHAIN_ZIP := SwiftToolchain.zip
1414
SWIFT_TOOLCHAIN_ROOT ?= SwiftToolchain-iphoneos
15-
SWIFT_STATIC_LIBS := $(wildcard $(SWIFT_TOOLCHAIN_ROOT)/lib/libswift*.a) \
16-
$(wildcard $(SWIFT_TOOLCHAIN_ROOT)/lib/lib_CompilerRegexParser.a) \
17-
$(wildcard $(SWIFT_TOOLCHAIN_ROOT)/lib/libclang*.a) \
18-
$(wildcard $(SWIFT_TOOLCHAIN_ROOT)/lib/liblld*.a) \
19-
$(wildcard $(SWIFT_TOOLCHAIN_ROOT)/lib/libLLVM*.a) \
20-
$(ROOT)/build/LLVMClangSwift_iphoneos/cmark-iphoneos-arm64/src/libcmark-gfm.a \
21-
$(ROOT)/build/LLVMClangSwift_iphoneos/cmark-iphoneos-arm64/extensions/libcmark-gfm-extensions.a
22-
SWIFT_HOST_COMPILER_DYLIBS := $(wildcard $(SWIFT_TOOLCHAIN_ROOT)/lib/swift/host/compiler/lib_Compiler*.dylib)
23-
SWIFT_LINK_PATHS := -L$(SWIFT_TOOLCHAIN_ROOT)/lib \
24-
-L$(SWIFT_TOOLCHAIN_ROOT)/lib/swift/iphoneos \
25-
-L$(SWIFT_TOOLCHAIN_ROOT)/lib/swift/iphoneos/$(APPLE_ARCH) \
26-
-L$(SWIFT_TOOLCHAIN_ROOT)/lib/swift/host/compiler
2715

2816
# Helper function
2917
define log_info
@@ -68,6 +56,18 @@ CoreCompiler.framework/CoreCompiler: INC := -ISource \
6856
-Ibuild/LLVMClangSwift_iphoneos/llvm-iphoneos-arm64/tools/clang/include \
6957
-Iswift/include \
7058
-Iswift/stdlib/public/SwiftShims
59+
CoreCompiler.framework/CoreCompiler: SWIFT_STATIC_LIBS := $(SWIFT_TOOLCHAIN_ROOT)/lib/libswift*.a \
60+
$(SWIFT_TOOLCHAIN_ROOT)/lib/lib_CompilerRegexParser.a \
61+
$(SWIFT_TOOLCHAIN_ROOT)/lib/libclang*.a \
62+
$(SWIFT_TOOLCHAIN_ROOT)/lib/liblld*.a \
63+
$(SWIFT_TOOLCHAIN_ROOT)/lib/libLLVM*.a \
64+
$(ROOT)/build/LLVMClangSwift_iphoneos/cmark-iphoneos-arm64/src/libcmark-gfm.a \
65+
$(ROOT)/build/LLVMClangSwift_iphoneos/cmark-iphoneos-arm64/extensions/libcmark-gfm-extensions.a
66+
CoreCompiler.framework/CoreCompiler: SWIFT_HOST_COMPILER_DYLIBS := $(SWIFT_TOOLCHAIN_ROOT)/lib/swift/host/compiler/lib_Compiler*.dylib
67+
CoreCompiler.framework/CoreCompiler: SWIFT_LINK_PATHS := -L$(SWIFT_TOOLCHAIN_ROOT)/lib \
68+
-L$(SWIFT_TOOLCHAIN_ROOT)/lib/swift/iphoneos \
69+
-L$(SWIFT_TOOLCHAIN_ROOT)/lib/swift/iphoneos/$(APPLE_ARCH) \
70+
-L$(SWIFT_TOOLCHAIN_ROOT)/lib/swift/host/compiler
7171
CoreCompiler.framework/CoreCompiler: swift-toolchain
7272
$(call log_info,building CoreCompiler framework)
7373
-rm -rf CoreCompilerSupportLibs

0 commit comments

Comments
 (0)