Changeset 933f32f for driver/cfa.cc

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 15 20:56:03 2019
-// Update Count     : 280
+// Last Modified On : Sun Feb 10 08:28:09 2019
+// Update Count     : 281
 //
 
@@ -107 +107 @@
         bool link = true;                                                                       // linking as well as compiling
         bool verbose = false;                                                           // -v flag
-        bool quiet = false;                                                                     // -quiet flag
-        bool debug = true;                                                                      // -debug flag
-        bool help = false;                                                                      // -help flag
+        bool quiet = false;                                                             // -quiet flag
+        bool debug = true;                                                              // -debug flag
+        bool nolib = false;                                                             // -nolib flag
+        bool help = false;                                                              // -help flag
         bool CFA_flag = false;                                                          // -CFA flag
         bool cpp_flag = false;                                                          // -E or -M flag, preprocessor only
@@ -162 +163 @@
                                 debug = true;                                                   // strip the debug flag
                         } else if ( arg == "-nodebug" ) {
-                                debug = false;                                                  // strip the nodebug flag
+                                debug = false;                                                  // strip the debug flag
+                        } else if ( arg == "-nolib" ) {
+                                nolib = true;                                                   // strip the nodebug flag
                         } else if ( arg == "-quiet" ) {
                                 quiet = true;                                                   // strip the quiet flag
@@ -366 +369 @@
                 }  // if
         } // if
-        const char * config = debug ? "debug": "nodebug";
+        const char * config = nolib ? "nolib" : (debug ? "debug": "nodebug");
         string libdir = libbase + arch + "-" + config;
 
-        if ( ! dirExists( libdir ) ) {
+        if ( ! nolib && ! dirExists( libdir ) ) {
                 cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
                 cerr << "Was looking for " << libdir << endl;
@@ -495 +498 @@
                 args[nargs] = "-Wno-deprecated";
                 nargs += 1;
+#ifdef HAVE_CAST_FUNCTION_TYPE
+                args[nargs] = "-Wno-cast-function-type";
+                nargs += 1;
+#endif // HAVE_CAST_FUNCTION_TYPE
                 if ( ! std_flag ) {                                                             // default c11, if none specified
                         args[nargs] = "-std=gnu11";