Skip to content

Commit 648b21b

Browse files
committed
Merge pull request #96813 from Repiteo/scons/fix-clang-cl-flags
SCons: Fix `clang-cl` link/ar flags
2 parents dd71bc2 + df0a88b commit 648b21b

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

platform/windows/detect.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -620,18 +620,16 @@ def spawn_capture(sh, escape, cmd, args, env):
620620
print("ThinLTO is only compatible with LLVM, use `use_llvm=yes` or `lto=full`.")
621621
sys.exit(255)
622622

623-
env.Append(CCFLAGS=["-flto=thin"])
624-
env.Append(LINKFLAGS=["-flto=thin"])
623+
env.AppendUnique(CCFLAGS=["-flto=thin"])
625624
elif env["use_llvm"]:
626-
env.Append(CCFLAGS=["-flto"])
627-
env.Append(LINKFLAGS=["-flto"])
625+
env.AppendUnique(CCFLAGS=["-flto"])
628626
else:
629627
env.AppendUnique(CCFLAGS=["/GL"])
630-
env.AppendUnique(ARFLAGS=["/LTCG"])
631-
if env["progress"]:
632-
env.AppendUnique(LINKFLAGS=["/LTCG:STATUS"])
633-
else:
634-
env.AppendUnique(LINKFLAGS=["/LTCG"])
628+
if env["progress"]:
629+
env.AppendUnique(LINKFLAGS=["/LTCG:STATUS"])
630+
else:
631+
env.AppendUnique(LINKFLAGS=["/LTCG"])
632+
env.AppendUnique(ARFLAGS=["/LTCG"])
635633

636634
if vcvars_msvc_config:
637635
env.Prepend(CPPPATH=[p for p in str(os.getenv("INCLUDE")).split(";")])

0 commit comments

Comments
 (0)