diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 50dee82e0..8c0f44f37 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -246,10 +246,6 @@ ifneq ($(LUNATIC),0)
     # FIXME: Lunatic builds with LTO don't start up properly as the required
     # symbol names are apparently not exported.
     override LTO=0
-
-    ifneq ($(CPLUSPLUS),0)
-        $(error "Lunatic C++ build not supported")
-    endif
 endif
 
 ifndef LTO
diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh
index 6e5434d81..228d0814a 100755
--- a/polymer/synthesis.sh
+++ b/polymer/synthesis.sh
@@ -171,8 +171,8 @@ then
 
     if [ -n "$BUILD_LUNATIC" ]; then
         # clean the tree and build
-        echo "${make[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
-        "${make[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
+        echo "${make[@]}" LUNATIC=1 $clean all
+        "${make[@]}" LUNATIC=1 $clean all
 
         # make sure all the targets were produced
         verifytargets
@@ -190,8 +190,8 @@ then
 
     if [ -n "$BUILD_LUNATIC" ]; then
         # clean the tree and build
-        echo "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
-        "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
+        echo "${make64[@]}" LUNATIC=1 $clean all
+        "${make64[@]}" LUNATIC=1 $clean all
 
         # make sure all the targets were produced
         verifytargets