提交 1b9bf28a 编写于 作者: S sgehwolf

8212110: Build of saproc.dll broken on Windows 32 bit after JDK-8210647

Reviewed-by: erikj, akasko
上级 2275336a
...@@ -101,6 +101,9 @@ checkAndBuildSA:: $(SAWINDBG) ...@@ -101,6 +101,9 @@ checkAndBuildSA:: $(SAWINDBG)
!if "$(BUILD_FLAVOR)" == "debug" !if "$(BUILD_FLAVOR)" == "debug"
SA_EXTRA_CFLAGS = -Od -D "_DEBUG" SA_EXTRA_CFLAGS = -Od -D "_DEBUG"
!if "$(BUILDARCH)" == "i486"
SA_EXTRA_CFLAGS = $(SA_EXTRA_CFLAGS) -RTC1
!endif
!elseif "$(BUILD_FLAVOR)" == "fastdebug" !elseif "$(BUILD_FLAVOR)" == "fastdebug"
SA_EXTRA_CFLAGS = -O2 -D "_DEBUG" SA_EXTRA_CFLAGS = -O2 -D "_DEBUG"
!else !else
...@@ -117,9 +120,11 @@ SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -D "WIN32" -D "WIN64" ...@@ -117,9 +120,11 @@ SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -D "WIN32" -D "WIN64"
SA_LD_FLAGS = bufferoverflowU.lib SA_LD_FLAGS = bufferoverflowU.lib
!endif !endif
!else !else
SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
!if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
SA_CFLAGS = $(SA_CFLAGS) -ZI # -ZI is incompatible with -O2 used for release/fastdebug builds.
# Using -Zi instead.
SA_CFLAGS = $(SA_CFLAGS) -Zi
!endif !endif
!endif !endif
!if "$(MT)" != "" !if "$(MT)" != ""
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册