Changes in driver/cfa.cc [c9e640e:b32ad080]

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb 10 08:28:09 2019
-// Update Count     : 281
+// Last Modified On : Fri Sep 14 23:02:59 2018
+// Update Count     : 277
 //
 
@@ -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 nolib = false;                                                             // -nolib flag
-        bool help = false;                                                              // -help flag
+        bool quiet = false;                                                                     // -quiet flag
+        bool debug = true;                                                                      // -debug flag
+        bool help = false;                                                                      // -help flag
         bool CFA_flag = false;                                                          // -CFA flag
         bool cpp_flag = false;                                                          // -E or -M flag, preprocessor only
@@ -163 +162 @@
                                 debug = true;                                                   // strip the debug flag
                         } else if ( arg == "-nodebug" ) {
-                                debug = false;                                                  // strip the debug flag
-                        } else if ( arg == "-nolib" ) {
-                                nolib = true;                                                   // strip the nodebug flag
+                                debug = false;                                                  // strip the nodebug flag
                         } else if ( arg == "-quiet" ) {
                                 quiet = true;                                                   // strip the quiet flag
@@ -360 +357 @@
 
         string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
-        if ( ! m32 && ! m64 ) {
-                if ( arch == "x86" ) {
-                        args[nargs] = "-m32";
-                        nargs += 1;
-                } else if ( arch == "x64" ) {
-                        args[nargs] = "-m64";
-                        nargs += 1;
-                }  // if
-        } // if
-        const char * config = nolib ? "nolib" : (debug ? "debug": "nodebug");
+        if ( ! m32 && ! m64 && arch == "x86" ) {                        // no override and 32-bit architecture
+                args[nargs] = "-m32";
+                nargs += 1;
+        } // if
+        const char * config = debug ? "debug": "nodebug";
         string libdir = libbase + arch + "-" + config;
 
-        if ( ! nolib && ! dirExists( libdir ) ) {
+        if ( ! dirExists( libdir ) ) {
                 cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
                 cerr << "Was looking for " << libdir << endl;
@@ -387 +379 @@
         nargs += 1;
 
-        for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
-                args[nargs] = libs[i];
-                nargs += 1;
-        } // for
-
         if ( link ) {
                 args[nargs] = "-Xlinker";
@@ -411 +398 @@
 
                 // include the cfa library in case it's needed
-                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
-                nargs += 1;
-                args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str();
                 nargs += 1;
                 args[nargs] = "-lcfa";
@@ -422 +407 @@
                 nargs += 1;
                 args[nargs] = "-lrt";
-                nargs += 1;
-                args[nargs] = "-lm";
                 nargs += 1;
         } // if
@@ -498 +481 @@
                 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";
@@ -512 +491 @@
                 args[nargs] = ( *new string( string("-B") + Bprefix ) ).c_str();
                 nargs += 1;
+                args[nargs] = "-lm";
+                nargs += 1;
         } else {
                 cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
                 exit( EXIT_FAILURE );
         } // if
+
+        for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
+                args[nargs] = libs[i];
+                nargs += 1;
+        } // for
 
         args[nargs] = NULL;                                                                     // terminate with NULL