From cf6f773b10ef850eab58053d38a7f5ebfae10120 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 5 Jan 2024 13:31:00 +0100 Subject: [PATCH] Make CXX17 the default This matches config of R 4.3 on other platforms. Fixes https://github.com/r-wasm/webr/issues/347 --- inst/webr-vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/webr-vars.mk b/inst/webr-vars.mk index 0659a52..1e9b299 100644 --- a/inst/webr-vars.mk +++ b/inst/webr-vars.mk @@ -64,12 +64,12 @@ CXX14 = em++ CXX17 = em++ CXX20 = em++ CC = emcc -CXX = em++ +CXX = em++ -std=gnu++17 FC = $(EMFC) CFLAGS = $(WASM_CFLAGS) CPPFLAGS = $(WASM_CPPFLAGS) -CXXFLAGS = -std=gnu++11 $(WASM_CXXFLAGS) +CXXFLAGS = $(WASM_CXXFLAGS) CXX98FLAGS = -std=gnu++98 $(WASM_CXXFLAGS) CXX11FLAGS = -std=gnu++11 $(WASM_CXXFLAGS) CXX14FLAGS = -std=gnu++14 $(WASM_CXXFLAGS)