Changeset bbfd0e0 for driver

Timestamp:

Aug 7, 2019, 3:23:56 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

14347ac

Parents:

7e0017f5

Message:

Tentative support for distcc in cforall, right now nothing works because distcc doesn't understand cfa

File:

• driver/cfa.cc (modified) (5 diffs)

driver/cfa.cc

@@ -84 +84 @@
         return false;
 } //dirExists
+
+static inline string dir(const string & path) {
+        return path.substr(0, path.find_last_of('/'));
+}
 
 
@@ -119 +123 @@
         bool m64 = false;                                    // -m64 flag
         bool intree = false;
+        bool disttree = false;
 
         const char *args[argc + 100];                                           // cfa command line values, plus some space for additional flags
@@ -178 +183 @@
                         } else if ( arg == "-in-tree" ) {
                                 intree = true;
+                        } else if ( arg == "-dist-tree" ) {
+                                disttree = true;
                         } else if ( arg == "-compiler" ) {
                                 // use the user specified compiler
@@ -372 +379 @@
         string libdir = libbase + arch + "-" + config;
 
-        if ( ! nolib && ! dirExists( libdir ) ) {
-                cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
-                cerr << "Was looking for " << libdir << endl;
-                libdir = libbase + arch + "-" + "nolib";
-        } // 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();
+        if (!disttree) {
+                if ( ! nolib && ! dirExists( libdir ) ) {
+                        cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
+                        cerr << "Was looking for " << libdir << endl;
+                        for(int i = 1; i < argc; i++) {
+                                cerr << argv[i] << " ";
+                        }
+                        cerr << endl;
+                        libdir = libbase + arch + "-" + "nolib";
+                } // if
+
+                if ( ! dirExists( libdir ) ) {
+                        cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
+                        cerr << "Was looking for " << libdir << endl;
+                        exit( EXIT_FAILURE );
+                } // if
+        } // if
+
+        if(disttree) {
+                args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + dir(argv[0])) ).c_str();
+        } else if(intree) {
+                args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + "/prelude") ).c_str();
+        } else {
+                args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir) ).c_str();
+        }
         nargs += 1;
 
@@ -473 +492 @@
 
         if ( Bprefix.length() == 0 ) {
-                Bprefix = ! intree ? installlibdir : srcdriverdir;
+                if(disttree) {
+                        Bprefix = dir(argv[0]);
+                } else if(intree) {
+                        Bprefix = srcdriverdir;
+                } else {
+                        Bprefix = installlibdir;
+                }
+
                 if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
                 args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();