Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 690166d66bcf27c9965bc1ba3c2be3acc8ba9d5f)
+++ driver/cfa.cc	(revision def9d4ece42b49cbb4f90f08f458811fe82b1e3f)
@@ -10,6 +10,6 @@
 // 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
 //
 
@@ -384,4 +384,9 @@
 	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";
@@ -414,4 +419,6 @@
 		nargs += 1;
 		args[nargs] = "-lrt";
+		nargs += 1;
+		args[nargs] = "-lm";
 		nargs += 1;
 	} // if
@@ -498,15 +505,8 @@
 		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