Changeset b544afa for driver

Timestamp:

Aug 30, 2019, 12:50:49 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:

33c849e

Parents:

417a630

Message:

move bprefix to environment variable for cc1

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 26 14:25:44 2019
-// Update Count     : 414
+// Last Modified On : Tue Aug 27 06:11:24 2019
+// Update Count     : 416
 //
 
@@ -64 +64 @@
     struct stat info;
     if ( stat( path.c_str(), &info ) != 0 ) return false;
-    if ( info.st_mode & S_IFDIR ) return true;
-        return false;
+        return (info.st_mode & S_IFDIR) != 0;
 } // dirExists
 
@@ -82 +81 @@
         string heading;                                                                         // banner printed at start of cfa compilation
         string arg;                                                                                     // current command-line argument during command-line parsing
-        string bprefix;                                                                         // path where gcc looks for compiler command steps
+        string bprefix;                                                                         // path where gcc looks for compiler steps
         string langstd;                                                                         // language standard
 
@@ -212 +211 @@
                         } else if ( prefix( arg, "-B" ) ) {
                                 bprefix = arg.substr(2);                                // strip the -B flag
-//                              args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + bprefix ) ).c_str();
                         } else if ( arg == "-c" || arg == "-S" || arg == "-E" || arg == "-M" || arg == "-MM" ) {
                                 args[nargs++] = argv[i];                                // pass argument along
@@ -323 +321 @@
                 args[nargs++] = "--undefined=__cfaabi_appready_startup";
 
-                // include the cfa library in case it's needed
+                // include the cfa library in case it is needed
                 args[nargs++] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
                 args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
@@ -373 +371 @@
                 bprefix = ! intree ? installlibdir : srcdriverdir;
                 if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
-//              args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + bprefix ) ).c_str();
                 Putenv( argv, ( *new string( string("-B=") + bprefix ) ).c_str() );
         } // if