defined OPTS_LD, OPTS_CXX instead of CMK_LIBDIR CMK_INCDIR
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 16 Jan 2005 05:17:59 +0000 (05:17 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 16 Jan 2005 05:17:59 +0000 (05:17 +0000)
OPTS_CXX normally are put after charm headers, so that for example mpi.h is looked at charm include first.

build

diff --git a/build b/build
index 5ce803b6a205881afd43faaa402f47e2590e9ffd..e775614b99e1e40f150d88743fa70f4350afe6b2 100755 (executable)
--- a/build
+++ b/build
@@ -336,8 +336,16 @@ $VERSION/tmp/system_ln "../../src/scripts/Makefile" $VERSION/tmp/Makefile
 ConvUsr="$VERSION/tmp/conv-mach-pre.sh"
 echo "Generating $ConvUsr"
 echo > $ConvUsr
-test -n "$LIBDIR" && echo "CMK_LIBDIR=\"$LIBDIR\"" >> $ConvUsr
-test -n "$INCDIR" && echo "CMK_INCDIR=\"$INCDIR\"" >> $ConvUsr
+if test -n "$LIBDIR" 
+then
+  echo "OPTS_LD=\"$LIBDIR\"" >> $ConvUsr
+  echo "OPTS_LDXX=\"$LIBDIR\"" >> $ConvUsr
+fi
+if test -n "$INCDIR" 
+then
+  echo "OPTS_CC=\"$INCDIR\"" >> $ConvUsr
+  echo "OPTS_CXX=\"$INCDIR\"" >> $ConvUsr
+fi
 chmod +x $ConvUsr
 
 # Create conv-mach-opt headers with special build-time options