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

SCons: Fix clang-cl link/ar flags

Browse Source
This commit is contained in:
Thaddeus Crews 2024-09-10 13:48:53 -05:00
parent 97ef3c8372
commit df0a88b128
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/windows/detect.py
View File

@ -620,18 +620,16 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
print("ThinLTO is only compatible with LLVM, use `use_llvm=yes` or `lto=full`.") print("ThinLTO is only compatible with LLVM, use `use_llvm=yes` or `lto=full`.")
sys.exit(255) sys.exit(255)
env.Append(CCFLAGS=["-flto=thin"]) env.AppendUnique(CCFLAGS=["-flto=thin"])
env.Append(LINKFLAGS=["-flto=thin"])
elif env["use_llvm"]: elif env["use_llvm"]:
env.Append(CCFLAGS=["-flto"]) env.AppendUnique(CCFLAGS=["-flto"])
env.Append(LINKFLAGS=["-flto"])
else: else:
env.AppendUnique(CCFLAGS=["/GL"]) env.AppendUnique(CCFLAGS=["/GL"])
env.AppendUnique(ARFLAGS=["/LTCG"]) if env["progress"]:
if env["progress"]: env.AppendUnique(LINKFLAGS=["/LTCG:STATUS"])
env.AppendUnique(LINKFLAGS=["/LTCG:STATUS"]) else:
else: env.AppendUnique(LINKFLAGS=["/LTCG"])
env.AppendUnique(LINKFLAGS=["/LTCG"]) env.AppendUnique(ARFLAGS=["/LTCG"])
if vcvars_msvc_config: if vcvars_msvc_config:
env.Prepend(CPPPATH=[p for p in str(os.getenv("INCLUDE")).split(";")]) env.Prepend(CPPPATH=[p for p in str(os.getenv("INCLUDE")).split(";")])