Changeset 23a08aa0 for libcfa/prelude

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix merge conflict

Location:

libcfa/prelude

Files:

• Makefile.am (modified) (2 diffs)
• defines.hfa.in (modified) (1 diff)

libcfa/prelude/Makefile.am

@@ -50 +50 @@
 
 prelude.cfa : prelude-gen.cc
-        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
+        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++17
         @./prelude-gen > ${@}
         @rm ./prelude-gen
@@ -76 +76 @@
 
 if ENABLE_DISTCC
-distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @CFACPP@ defines.hfa gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
         ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@ @DIST_BWLIMIT@
         @echo "Dummy file to track distribution to remote hosts" > ${@}

libcfa/prelude/defines.hfa.in

@@ -141 +141 @@
 
 /* Defined if io_uring support is present when compiling libcfathread and
+   supports the flag IORING_REGISTER_IOWQ_MAX_WORKERS. */
+#undef CFA_HAVE_IORING_REGISTER_IOWQ_MAX_WORKERS
+
+/* Defined if io_uring support is present when compiling libcfathread and
    supports the flag IORING_SETUP_ATTACH_WQ. */
 #undef CFA_HAVE_IORING_SETUP_ATTACH_WQ