asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #54394 from robfram/freebsd-llvm-no-atomic-lib

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-01 22:30:13 +01:00 committed by GitHub
commit bf59549f68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/x11/detect.py
View file

@ -393,9 +393,9 @@ def configure(env):
# Link those statically for portability # Link those statically for portability
if env["use_static_cpp"]: if env["use_static_cpp"]:
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"]) env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
if env["use_llvm"]: if env["use_llvm"] and platform.system() != "FreeBSD":
env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a" env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
else: else:
if env["use_llvm"]: if env["use_llvm"] and platform.system() != "FreeBSD":
env.Append(LIBS=["atomic"]) env.Append(LIBS=["atomic"])