fixed bug for override:
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 30 Nov 2004 21:35:30 +0000 (21:35 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 30 Nov 2004 21:35:30 +0000 (21:35 +0000)
CMK_CXX="$OVERRIDE_CXX $CMK_CXX "
which generated command line with 2 compilers.

src/scripts/charmc

index 74aeeda5d34a300acfc976effb6e24598eba2b00..ab6e8f1cd1af14662f03735c2f195aa4b9e57511 100755 (executable)
@@ -748,6 +748,31 @@ then
        esac
 fi
 
        esac
 fi
 
+if [ -n "$OVERRIDE_CC" ]
+then
+    CMK_CC="$OVERRIDE_CC"
+fi
+Debug "set 2"
+if [ -n "$OVERRIDE_CXX" ]
+then
+    CMK_CXX="$OVERRIDE_CXX"
+fi
+
+if [ -n "$OVERRIDE_F90" ]
+then
+    CMK_CF90="$OVERRIDE_F90"
+fi
+
+if [ -n "$OVERRIDE_LD" ]
+then
+    CMK_LD="$OVERRIDE_LD"
+fi
+
+if [ -n "$OVERRIDE_LDXX" ]
+then
+    CMK_LDXX="$OVERRIDE_LDXX"
+fi
+
 if [ -n "$USE_RELIABLE_CC" ]
 then
        CMK_CC="$CMK_CC_RELIABLE"
 if [ -n "$USE_RELIABLE_CC" ]
 then
        CMK_CC="$CMK_CC_RELIABLE"
@@ -804,37 +829,12 @@ then
     CMK_LDXX="$CMK_NATIVE_LDXX" 
 fi
 
     CMK_LDXX="$CMK_NATIVE_LDXX" 
 fi
 
-if [ -n "$OVERRIDE_CC" ]
-then
-    CMK_CC="$OVERRIDE_CC $CMK_CC "
-fi
-Debug "set 2"
-if [ -n "$OVERRIDE_CXX" ]
-then
-    CMK_CXX="$OVERRIDE_CXX $CMK_CXX "
-fi
-
-if [ -n "$OVERRIDE_F90" ]
-then
-    CMK_CF90="$OVERRIDE_F90 $CMK_CF90 "
-fi
-
-if [ -n "$OVERRIDE_LD" ]
-then
-    CMK_LD="$OVERRIDE_LD $CMK_LD"
-fi
-
 if [ -n "$PURIFY" ]
 then
     CMK_LD="purify $CMK_LD"
     CMK_LDXX="purify $CMK_LDXX"
 fi
 
 if [ -n "$PURIFY" ]
 then
     CMK_LD="purify $CMK_LD"
     CMK_LDXX="purify $CMK_LDXX"
 fi
 
-if [ -n "$OVERRIDE_LDXX" ]
-then
-    CMK_LDXX="$OVERRIDE_LDXX $CMK_LDXX"
-fi
-
 Debug "set 4"
 if [ -n "$OPTIMIZE_MODE" ]
 then
 Debug "set 4"
 if [ -n "$OPTIMIZE_MODE" ]
 then