CI: Copy used C++ runtime library into the GTK bundle

geany · Oct 3, 2023 · 354c7ba · 354c7ba
1 parent 579c074
commit 354c7ba
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/scripts/ci_mingw64_geany.sh b/scripts/ci_mingw64_geany.sh
@@ -208,6 +208,13 @@ create_gtk_bundle() {
 	mkdir ${GTK_BUNDLE_DIR}
 	cd ${GTK_BUNDLE_DIR}
 	bash ${GEANY_BUILD_DIR}/scripts/gtk-bundle-from-msys2.sh -x -3
+
+	# We use the "posix" variant of the mingw64 cross compiler which has support for
+	# C++ features like "std:future". For this to work, we need to use the corresponding
+	# C++ runtime library and copy (and strip) it to the resulting bundle.
+	gcc_version="$(${HOST}-gcc -dumpversion)/libstdc++-6.dll"
+	cp "/usr/lib/gcc/${HOST}/${gcc_version}" "${GTK_BUNDLE_DIR}/bin"
+	${HOST}-strip "${GTK_BUNDLE_DIR}/bin/libstdc++-6.dll"
 }