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

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 : Fri Sep 14 23:02:59 2018
-// Update Count     : 277
+// Last Modified On : Tue Jan 15 20:56:03 2019
+// Update Count     : 280
 //
 
@@ -357 +357 @@
 
         string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
-        if ( ! m32 && ! m64 && arch == "x86" ) {                        // no override and 32-bit architecture
-                args[nargs] = "-m32";
-                nargs += 1;
+        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 = debug ? "debug": "nodebug";
@@ -379 +384 @@
         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";
@@ -398 +408 @@
 
                 // include the cfa library in case it's needed
-                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str();
+                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();
                 nargs += 1;
                 args[nargs] = "-lcfa";
@@ -407 +419 @@
                 nargs += 1;
                 args[nargs] = "-lrt";
+                nargs += 1;
+                args[nargs] = "-lm";
                 nargs += 1;
         } // if
@@ -491 +505 @@
                 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