From 861f9e4f94bb84e1cfb8c3a1a44b96cbcd47387a Mon Sep 17 00:00:00 2001 From: Daemonratte Date: Wed, 29 Apr 2026 09:40:46 +0200 Subject: [PATCH] build: avoid duplicate MSVC_TOOLSET definition --- build/Makefile-newvs.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index 81611776e..629cfed1f 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -18,9 +18,11 @@ MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 endif if MSVC_NO_TOOLSET_SET -MSVC_TOOLSET = $(MSVC_VER)0 +MSVC_TOOLSET_DEFAULT = $(MSVC_VER)0 endif +MSVC_TOOLSET_FINAL = $(MSVC_TOOLSET)$(MSVC_TOOLSET_DEFAULT) + %.sln: sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ @@ -33,9 +35,9 @@ endif %.vcxproj: if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET_FINAL)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET_FINAL)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi %.props: $(top_builddir)/build/win32/vs10/Makefile