Changeset 44aad8f for driver

Timestamp:

Apr 27, 2020, 4:36:58 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c59a346

Parents:

038be32 (diff), c680a4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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