root
/
setup-cpp
mirror of https://github.com/aminya/setup-cpp.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #388 from aminya/llvm 

fix: do not add LLVM libraries to dyld by default
This commit is contained in:
Amin Ya 2025-04-07 02:54:48 -07:00 committed by GitHub
parent f37a612a84 7e66da1495
commit ad7d44b1e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/legacy/lib.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/legacy/lib.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/modern/lib.mjs vendored
View File

File diff suppressed because one or more lines are too long

2
dist/modern/lib.mjs.map vendored
View File

File diff suppressed because one or more lines are too long

6
src/llvm/llvm.ts
View File

@ -88,8 +88,8 @@ export async function activateLLVM(directory: string, version: string) {
addEnv("LLVM_PATH", directory, rcOptions),
// Setup LLVM as the compiler
addEnv("LD_LIBRARY_PATH", `${ld}${delimiter}${directory}/lib`, rcOptions),
addEnv("DYLD_LIBRARY_PATH", `${dyld}${delimiter}${directory}/lib`, rcOptions),
addEnv("LLVM_LD_LIBRARY_PATH", `${ld}${delimiter}${directory}/lib`, rcOptions),
addEnv("LLVM_DYLD_LIBRARY_PATH", `${dyld}${delimiter}${directory}/lib`, rcOptions),
// compiler flags
addEnv("LLVM_LDFLAGS", `-L${quoteIfHasSpace(`${directory}/lib`)}`, rcOptions),
@ -102,7 +102,7 @@ export async function activateLLVM(directory: string, version: string) {
? addEnv("LLVM_CPATH", `${directory}/lib/clang/${llvmMajor}/include`, rcOptions)
: Promise.resolve(),
addEnv("LIBRARY_PATH", `${directory}/lib`, rcOptions),
addEnv("LLVM_LIBRARY_PATH", `${directory}/lib`, rcOptions),
// os sdks
setupMacOSSDK(),