diff --git a/configure b/configure
index 0101d2567..9343873c0 100755
--- a/configure
+++ b/configure
@@ -895,6 +895,12 @@ if test "$_build_release" = no ; then
 	_build_release=
 fi
 
+# Workaround until we deal with autodetection of C compiler properly
+# Or we remove C files from Stella entirely, by making them C++
+if test -z "$CC"; then
+	CC=cc
+fi
+
 echo "Creating config.mak"
 cat > config.mak << EOF
 # -------- Generated by configure -----------