Target C++17

ashtonmeuser · Jun 1, 2024 · adea800 · adea800
1 parent 3ce84a1
commit adea800
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/SConstruct b/SConstruct
@@ -32,13 +32,13 @@ elif env["wasm_runtime"] == "wasmtime":
 
 # Check platform specifics
 if env["platform"] in ["osx", "macos"]:
-    env.Prepend(CFLAGS=["-std=gnu11"])
-    env.Prepend(CXXFLAGS=["-std=gnu++17"])
+    env.Prepend(CFLAGS=["-std=c11"])
+    env.Prepend(CXXFLAGS=["-std=c++17"])
     env.Append(CCFLAGS=["-arch", "x86_64", "-Wall", "-g", "-O3"])
     env.Append(LINKFLAGS=["-arch", "x86_64", "-framework", "Security", "-framework", "CoreFoundation", "-framework", "SystemConfiguration"])
 elif env["platform"] == "linux":
-    env.Prepend(CFLAGS=["-std=gnu11"])
-    env.Prepend(CXXFLAGS=["-std=gnu++17"])
+    env.Prepend(CFLAGS=["-std=c11"])
+    env.Prepend(CXXFLAGS=["-std=c++17"])
     env.Append(CCFLAGS=["-fPIC", "-g", "-O3"])
 elif env["platform"] == "windows":
     env.Prepend(CCFLAGS=["/std:c++17", "-W3", "-GR", "-O2", "-EHsc"])

diff --git a/SCsub b/SCsub
@@ -19,11 +19,14 @@ elif module_env["wasm_runtime"] == "wasmtime":
 
 # Check platform specifics
 if env["platform"] in ["linux", "linuxbsd", "x11"]:
+    env.Prepend(CXXFLAGS=["-std=c++17"])
     env["LIBRUNTIMESUFFIX"] = ".a"
 elif env["platform"] in ["osx", "macos"]:
+    env.Prepend(CXXFLAGS=["-std=c++17"])
     env["LIBRUNTIMESUFFIX"] = ".a"
     env.Append(LINKFLAGS=["-framework", "Security", "-framework", "CoreFoundation", "-framework", "SystemConfiguration"])
 elif env["platform"] == "windows":
+    env.Prepend(CCFLAGS=["/std:c++17"])
     if env.get("use_mingw"):  # MinGW
         env["LIBRUNTIMESUFFIX"] = ".a"
         env.Append(LIBS=["userenv"])