Index: src/config.h.in
===================================================================
--- src/config.h.in	(revision 4dcaed2c212a42d633824e9b88053258a2d0f969)
+++ src/config.h.in	(revision 28582b2f67a95666cd46d6aa6b773838c5711333)
@@ -1,3 +1,9 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* CPU to use if the -m32 flags is given. */
+#undef CFA_32_CPU
+
+/* CPU to use if the -m64 flags is given. */
+#undef CFA_64_CPU
 
 /* Location of include files. */
@@ -6,4 +12,7 @@
 /* Location of cfa command. */
 #undef CFA_BINDIR
+
+/* Default cpu to use if neither -m32 or -m64 are defined. */
+#undef CFA_DEFAULT_CPU
 
 /* compilation flags for cfa libraries and test programs. */
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 4dcaed2c212a42d633824e9b88053258a2d0f969)
+++ src/main.cc	(revision 28582b2f67a95666cd46d6aa6b773838c5711333)
@@ -209,13 +209,13 @@
 			// -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
 
-			assertf( (libcfap | treep) != PreludeDirector.empty(), "When building in tree option --prelude-dir must be used." );
+			assertf( !PreludeDirector.empty(), "Can't find prelude without option --prelude-dir must be used." );
 
 			// Read to gcc builtins, if not generating the cfa library
-			FILE * gcc_builtins = fopen( libcfap | treep ? (PreludeDirector + "/gcc-builtins.cf").c_str() : CFA_LIBDIR "/gcc-builtins.cf", "r" );
+			FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cf").c_str(), "r" );
 			assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
 			parse( gcc_builtins, LinkageSpec::Compiler );
 
 			// read the extra prelude in, if not generating the cfa library
-			FILE * extras = fopen( libcfap | treep ? (PreludeDirector + "/extras.cf").c_str() : CFA_LIBDIR "/extras.cf", "r" );
+			FILE * extras = fopen( (PreludeDirector + "/extras.cf").c_str(), "r" );
 			assertf( extras, "cannot open extras.cf\n" );
 			parse( extras, LinkageSpec::BuiltinC );
@@ -223,10 +223,10 @@
 			if ( ! libcfap ) {
 				// read the prelude in, if not generating the cfa library
-				FILE * prelude = fopen( treep ? (PreludeDirector + "/prelude.cf").c_str() : CFA_LIBDIR "/prelude.cf", "r" );
+				FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
 				assertf( prelude, "cannot open prelude.cf\n" );
 				parse( prelude, LinkageSpec::Intrinsic );
 
 				// Read to cfa builtins, if not generating the cfa library
-				FILE * builtins = fopen( libcfap | treep ? (PreludeDirector + "/builtins.cf").c_str() : CFA_LIBDIR "/builtins.cf", "r" );
+				FILE * builtins = fopen( (PreludeDirector + "/builtins.cf").c_str(), "r" );
 				assertf( builtins, "cannot open builtins.cf\n" );
 				parse( builtins, LinkageSpec::BuiltinCFA );
@@ -352,5 +352,5 @@
 		PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
 
-		CodeGen::FixMain::fix( *output, treep ? (PreludeDirector + "/bootloader.c").c_str() : CFA_LIBDIR "/bootloader.c" );
+		CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
 		if ( output != &cout ) {
 			delete output;