godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46348 from hpvb/static-link-atomic-clang-32 

[3.2] Allow static linking with libatomic using clang
This commit is contained in:
Rémi Verschelde 2021-02-23 15:09:14 +01:00 committed by GitHub
parent 3faf485da7 5f71fad6b6
commit 87deef7d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/x11/detect.py
View File

@ -129,7 +129,6 @@ def configure(env):
env["CC"] = "clang" env["CC"] = "clang"
env["CXX"] = "clang++" env["CXX"] = "clang++"
env.extra_suffix = ".llvm" + env.extra_suffix env.extra_suffix = ".llvm" + env.extra_suffix
env.Append(LIBS=["atomic"])
if env["use_lld"]: if env["use_lld"]:
if env["use_llvm"]: if env["use_llvm"]:
@ -382,3 +381,9 @@ def configure(env):
# That doesn't make any sense but it's likely a Ubuntu bug? # That doesn't make any sense but it's likely a Ubuntu bug?
if is64 or env["bits"] == "64": if is64 or env["bits"] == "64":
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"]) env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
if env["use_llvm"]:
env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
else:
if env["use_llvm"]:
env.Append(LIBS=["atomic"])