configure.ac | 4 +++- solenv/gbuild/platform/com_MSC_defs.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 7049a53bd80bf0d41df5e14dee8fa0451897b5b6 Author: Christian Lohmaier <[email protected]> AuthorDate: Fri Mar 24 12:57:11 2017 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Jul 23 18:27:40 2018 +0200 use VS 2015 to target XP with the 7.1A SDK Change-Id: I527a524c282d4314e57c30cdd9eb89bff38443db diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 71eb80978129..cc73510bb451 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -54,7 +54,7 @@ gb_COMPILERDEFS := \ -D_MT \ -D_DLL \ -DCPPU_ENV=$(gb_CPPU_ENV) \ - $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ + $(if $(findstring 140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ ifeq ($(CPUNAME),INTEL) gb_COMPILERDEFS += \ commit f3959e00a8487cdbf0b14f6dffd1b4d9bb64074c Author: Mike Kaganski <[email protected]> AuthorDate: Mon Oct 23 15:31:52 2017 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Jul 23 18:27:31 2018 +0200 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) https://stackoverflow.com/questions/32517234/access-violation-on-static-initialization Change-Id: Ibda63c6307e6dc4ae1eec4b0c673a987f33bed94 Reviewed-on: https://gerrit.libreoffice.org/43721 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/configure.ac b/configure.ac index 87f3bd45369f..67a25ac49ed6 100644 --- a/configure.ac +++ b/configure.ac @@ -6154,7 +6154,9 @@ if test "$GCC" = "yes"; then else # MSVC has sprouted C++11 thread-safe statics in 2015 # http://blogs.msdn.com/b/vcblog/archive/2015/06/19/c-11-14-17-features-in-vs-2015-rtm.aspx - if test "$COM" = "MSC" -a "$VCVER" -ge "140"; then + # but it doesn't work on Windows XP, so don't use it for 32-bit builds baselined for Windows XP + if test "$COM" = "MSC" -a "$VCVER" -ge "140" -a "$with_windows_sdk" != "7.1A"; then + HAVE_THREADSAFE_STATICS=TRUE AC_DEFINE(HAVE_THREADSAFE_STATICS) AC_MSG_RESULT([yes]) else diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b2af97f5f2ac..71eb80978129 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -149,6 +149,7 @@ gb_CFLAGS := \ -Gs \ -GS \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ + $(if $(HAVE_THREADSAFE_STATICS),,-Zc:threadSafeInit-) \ -nologo \ -W4 \ -wd4091 \ @@ -190,6 +191,7 @@ gb_CXXFLAGS := \ -GS \ -Gy \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ + $(if $(HAVE_THREADSAFE_STATICS),,-Zc:threadSafeInit-) \ -nologo \ -W4 \ -wd4091 \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
