Changes in driver/cfa.cc [92a9768:c680a4b]

File:

• driver/cfa.cc (modified) (1 diff)

driver/cfa.cc

@@ -385 +385 @@
         } // if
 
+        string preludedir;
         switch(path) {
-        case Installed   : Putenv( argv, "--prelude-dir=" + libdir ); break;
-        case BuildTree   : Putenv( argv, "--prelude-dir=" + libdir + "/prelude" ); break;
-        case Distributed : Putenv( argv, "--prelude-dir=" + dir(argv[0]) ); break;
+        case Installed   : preludedir = libdir; break;
+        case BuildTree   : preludedir = libdir + "/prelude"; break;
+        case Distributed : preludedir = dir(argv[0]); break;
         }
+
+        Putenv( argv, "--prelude-dir=" + preludedir );
+        args[nargs++] = "-include";
+        args[nargs++] = (*new string(preludedir + "/defines.hfa")).c_str();
 
         for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries