diff --git a/Makefile b/Makefile
index 74ce9cdeeb0..5cb38d1e307 100644
--- a/Makefile
+++ b/Makefile
@@ -114,9 +114,13 @@ cross-compile-build-tools:
 	  unset CXXFLAGS ; \
 	  unset SDKROOT ; \
 	  unset UNIVERSAL_SDK_PATH ; \
+	  configure_opts= ; \
+	  if test "$ENABLE_LIBCPP" -ne 0 ; then \
+	    configure_opts="$$configure_opts --enable-libcpp"; \
+	  fi; \
 	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
 		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
-	        --disable-polly ; \
+	        --disable-polly $$configure_opts; \
 	  cd .. ; \
 	fi; \
 	($(MAKE) -C BuildTools \