depends: c++17 fixes

diff --git a/contrib/depends/hosts/mingw32.mk b/contrib/depends/hosts/mingw32.mk
index 604a34d8d48aa9e930ef179aebe9c452fc19d9a6..5ab3df1c16fc7bae46c744bc41c0e79297340f22 100644 (file)
--- a/contrib/depends/hosts/mingw32.mk
+++ b/contrib/depends/hosts/mingw32.mk
@@ -3,7 +3,7 @@ mingw32_CXX := $(host)-g++-posix
 endif
 
 mingw32_CFLAGS=-pipe
-mingw32_CXXFLAGS=-pipe std=$(CXX_STANDARD)
+mingw32_CXXFLAGS=-pipe -std=$(CXX_STANDARD)
 mingw32_ARFLAGS=cr
 
 mingw32_release_CFLAGS=-O2

diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 86e826e28052ac321493ffeb83f8fb4df59343cc..4b548732fa503b6cdc2f1df6d6b6f3e7ce75444e 100644 (file)
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -111,7 +111,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   SET(PORT OFF)
   SET(CMAKE_OSX_SYSROOT "@prefix@/native/SDK")
   SET(CMAKE_OSX_DEPLOYMENT_TARGET "11")
-  SET(CMAKE_CXX_STANDARD 14)
+  SET(CMAKE_CXX_STANDARD 17)
   SET(LLVM_ENABLE_PIC OFF)
   SET(LLVM_ENABLE_PIE OFF)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")