Reject VS2022 compiler versions with the known bugs

ruby · Feb 1, 2023 · ee3176a · ee3176a
1 parent 9417834
commit ee3176a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
@@ -728,9 +728,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define ALWAYS_INLINE(x) __forceinline x
 #define WARN_UNUSED_RESULT(x) x
 #define MAYBE_UNUSED(x) x
-!if !defined(VS2022_FP_BUG)
 #define HAVE___ASSUME 1
-!endif
 #define FUNC_STDCALL(x) __stdcall x
 #define FUNC_CDECL(x) __cdecl x
 #define FUNC_FASTCALL(x) __fastcall x

diff --git a/win32/setup.mak b/win32/setup.mak
@@ -163,9 +163,10 @@ main(void)
 }
 <<
 	@( \
-	  ($(CC) -O2 -DNO_ASSUME $@.c && .\$@ && $(CC) -O2 $@.c) && \
-	  (.\$@ || echo>>$(MAKEFILE) VS2022_FP_BUG=1) \
-	) & $(WIN32DIR:/=\)\rm.bat $@.*
+	  $(CC) -O2 $@.c && .\$@ || \
+	  set bug=%ERRORLEVEL% \
+	  echo This compiler has an optimization bug \
+	) & $(WIN32DIR:/=\)\rm.bat $@.* & exit /b %bug%
 
 -version-: nul verconf.mk