Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision d6f4488012b9dc8383787c7a202110e6e2dca2a9)
+++ driver/cfa.cc	(revision a9fb796f56bcdcc50c4cfcea5f2ae6641c3b82b2)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 23 09:42:47 2018
-// Update Count     : 267
+// Last Modified On : Thu Aug 23 15:41:55 2018
+// Update Count     : 270
 //
 
@@ -343,5 +343,5 @@
 		args[nargs] = "-I" CFA_INCDIR;
 		nargs += 1;
-		if ( ! noincstd_flag ) {							// do not use during build
+		if ( ! noincstd_flag ) {						// do not use during build
 			args[nargs] = "-I" CFA_INCDIR "stdhdr";
 			nargs += 1;
@@ -354,5 +354,5 @@
 		args[nargs] = "-I" TOP_SRCDIR "libcfa/src";
 		nargs += 1;
-		if ( ! noincstd_flag ) {							// do not use during build
+		if ( ! noincstd_flag ) {						// do not use during build
 			args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr";
 			nargs += 1;
@@ -379,18 +379,23 @@
 	}
 
-	const char * const arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
+	string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
+	if ( ! m32 && ! m64 && arch == "x86" ) {			// no override and 32-bit architecture
+		args[nargs] = "-m32";
+		nargs += 1;
+	} // if
 	const char * config = debug ? "debug": "nodebug";
 	string libdir = libbase + arch + "-" + config;
-	if( !dirExists(libdir) ) {
+
+	if ( ! dirExists( libdir ) ) {
 		cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
 		cerr << "Was looking for " << libdir << endl;
 		libdir = libbase + arch + "-" + "nolib";
-	}
-
-	if( !dirExists(libdir) ) {
+	} // if
+
+	if ( ! dirExists( libdir ) ) {
 		cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
 		cerr << "Was looking for " << libdir << endl;
 		exit( EXIT_FAILURE );
-	}
+	} // if
 
 	args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str();