--- a/make/makefile.mk	Tue Nov 12 17:34:04 2024 +0100
+++ b/make/makefile.mk	Mon Nov 18 22:05:42 2024 +0100
@@ -59,6 +59,15 @@
 test-compile: static FORCE
 	cd tests && $(MAKE)
 
+check-cxx: CXX-AVAILABLE clean test-compile-cxx FORCE
+	$(build_dir)/tests/ucxtest
+
+test-compile-cxx: static FORCE
+	cd tests && $(MAKE) CC=$(CXX) CFLAGS="$(CFLAGS) $(CXXFLAGS)"
+
+CXX-AVAILABLE:
+	test -n "$(WITH_CXX_TEST)"
+
 docs: FORCE
 	@(test "$(WITH_DOCS_API)" = "yes" && cd docs && $(MAKE) all-api) \
 		|| echo "[ Generation of API Docs disabled - skipped ]"
@@ -67,6 +76,6 @@
 
 update-rules: FORCE
 	make/update-rules.sh src
-	CFLAGS='$(CFLAGS) -I../src' make/update-rules.sh tests '$$(TEST_DIR)'
+	make/update-rules.sh tests '$$(TEST_DIR)' '-I../src'
 
 FORCE: