[vlc-commits] [Git][videolan/vlc][3.0.x] Revert "package/win32: enable Control Flow Guard when building with LLVM16+"

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
72e060bf by Steve Lhomme at 2026-07-20T07:30:11+00:00
Revert "package/win32: enable Control Flow Guard when building with LLVM16+"

This reverts commit fbe4f357b1bc0bdaf78336abe1b262829d214781.

Qt 5.6.3 crashes in some qt_ft_longjmp() call when Control Flow Guard is enabled.

Fixes Windows ARM64 builds.

- - - - -


1 changed file:

- extras/package/win32/build.sh


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -138,9 +138,6 @@ if ! printf "#ifdef __clang__\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/d
     if ! printf "#if __clang_major__ >= 14\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/dev/null; then
         COMPILING_WITH_CLANG14=1
     fi
-    if ! printf "#if __clang_major__ >= 16\n#error CLANG\n#endif" | $CC -E - 1>/dev/null 2>/dev/null; then
-        COMPILING_WITH_CLANG16=1
-    fi
     COMPILING_WITH_CLANG=1
 else
     COMPILING_WITH_CLANG=0
@@ -367,11 +364,6 @@ if [ "$COMPILING_WITH_CLANG" -gt 0 ]; then
         VLC_CXXFLAGS="$VLC_CXXFLAGS --end-no-unused-arguments"
         VLC_LDFLAGS="$VLC_LDFLAGS --end-no-unused-arguments"
     fi
-    if [ "${COMPILING_WITH_CLANG16}" = "1" ]; then
-        VLC_CFLAGS="$VLC_CFLAGS -mguard=cf"
-        VLC_CXXFLAGS="$VLC_CXXFLAGS -mguard=cf"
-        VLC_LDFLAGS="$VLC_LDFLAGS -mguard=cf"
-    fi
 fi
 
 if [ -z "$PKG_CONFIG" ]; then



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/72e060bf0f68e956dcc69833785b21c883f6f7fa

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/72e060bf0f68e956dcc69833785b21c883f6f7fa
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help