Changeset 33c849e

Timestamp:

Aug 30, 2019, 12:52:14 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7c8246d

Parents:

b544afa

Message:

temporarily use library path versus bprefix to locate cfa-cpp

File:

• driver/cc1.cc (modified) (4 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 26 14:21:22 2019
-// Update Count     : 375
+// Last Modified On : Fri Aug 30 12:47:39 2019
+// Update Count     : 380
 //
 
@@ -33 +33 @@
 
 
-static string compiler_path( CFA_BACKEND_CC );                  // path/name of C compiler
+static string library_path( CFA_LIBDIR );                               // cfa-cpp path
+static string compiler_path( CFA_BACKEND_CC );                  // C compiler path/name
 static bool CFA_flag = false;                                                   // -CFA flag
 static bool save_temps = false;                                                 // -save-temps flag
@@ -100 +101 @@
                         } else if ( prefix( val, "-B=" ) ) {            // location of cfa-cpp
                                 bprefix = val.substr( 3 );
-                        } else {
+                        } else {                                                                        // normal flag for cfa-cpp
                                 args[nargs++] = ( *new string( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) ) ).c_str();
                         } // if
@@ -430 +431 @@
 
         if ( fork() == 0 ) {                                                            // child runs CFA
-                cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
+//              if ( bprefix != library_path ) { cerr << bprefix << " " << library_path << endl; abort(); }
+                cargs[0] = ( *new string( library_path + "cfa-cpp" ) ).c_str();
                 cargs[ncargs++] = cpp_in;