Merge pull request #2694 from dennisschagt/compile-ffi-with-c++14

Compile CXX FFI with C++14
newsboat · Mar 9, 2024 · 8784c2e · 8784c2e
2 parents bf5743c + cb4946f
commit 8784c2e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -24,6 +24,7 @@ DEFINES=-DLOCALEDIR='"$(localedir)"'
 
 WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
 INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss -I$(CARGO_TARGET_DIR)/cxxbridge/
+# Keep in sync with c++ version specified in FFI build.rs
 BARE_CXXFLAGS=-std=c++14 -O2 -ggdb $(INCLUDES)
 LDFLAGS+=-L.
 

diff --git a/rust/libnewsboat-ffi/build.rs b/rust/libnewsboat-ffi/build.rs
@@ -1,6 +1,7 @@
 fn add_cxxbridge(module: &str) {
     cxx_build::bridge(format!("src/{module}.rs"))
-        .flag("-std=c++11")
+        // Keep in sync with c++ version specified in Makefile
+        .std("c++14")
         // Disable warnings in generated code, since we can't affect them directly. We have to do
         // this because these warnings are turned into errors when we pass `-D warnings` to Cargo
         // on CI.