Skip to content

Commit b463b42

Browse files
committed
gen_descriptor: normalize clang-cl -std:c++17 -> -std=c++17
Windows clang-cl uses the MSVC colon form; the cxx-std sanity assert expects the canonical gnu form. Normalize at capture. (Last windows gap: sources/snapshot/ flags all generate clean now — 375 C/C++ + 27 asm, 171 snapshot files.)
1 parent 6e13a04 commit b463b42

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/compat-opencv/gen_descriptor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def rel_posix(child, parent):
115115
if d: incs.append(d)
116116
elif i + 1 < len(toks): incs.append(toks[i + 1].strip('"')); skip = True
117117
continue
118-
if t.startswith(("/std:", "-std:")): std = t; continue
118+
if t.startswith(("/std:", "-std:")): std = "-std=" + t.split(":", 1)[1]; continue # clang-cl -std:c++17 -> canonical
119119
# msvc codegen/warning/runtime flags mcpp supplies itself — drop
120120
if t.startswith("/") or t in ("-TP", "-TC") or t.startswith(("-W", "-Q")): continue
121121
if t == "-isystem":

0 commit comments

Comments
 (0)