a new charmc option "-use-build-options" to compile a charm program with the user...
authorGengbin Zheng <gzheng@justice.(none)>
Thu, 11 Feb 2010 17:27:39 +0000 (11:27 -0600)
committerGengbin Zheng <gzheng@justice.(none)>
Thu, 11 Feb 2010 17:27:39 +0000 (11:27 -0600)
build
src/scripts/charmc

diff --git a/build b/build
index 9648f217a2789ad2624246dbbb4de3d984c054d7..494795ed9cc4aa1a105adce61f6f55b4dbbc63c8 100755 (executable)
--- a/build
+++ b/build
@@ -571,6 +571,8 @@ printError()
        exit $MAKEEXIT
 }
 
+echo 'BUILDOPTS="'$OPTS'"'  >> $ConvSh
+
 Echo "Performing '$MAKE $MAKEOPTS basics OPTS="$OPTS" QUIET="$QUIET"' in $VERSION/tmp"
 cd $DESTINATION/tmp 
 $MAKE $MAKEOPTS basics OPTS="$OPTS $BUILD_SHARED" QUIET="$QUIET"
index fc47bbc31e8691ea6a944b71e5d0ac2975d49825..6246e5462a99cd630d8f9e702b889a74097fed43 100755 (executable)
@@ -79,6 +79,7 @@ USE_FASTEST_CC=""
 PROG_EXT=""
 
 COPY_CHARMRUN=true
+USE_BUILD_OPTIONS=0
 
 COPY_EXIT="true"
 CHARM_SHARED="0"
@@ -724,6 +725,9 @@ do
        -no-charmrun)
                COPY_CHARMRUN=false
                ;;
+       -use-build-options)
+               USE_BUILD_OPTIONS=1
+               ;;
         -h|--help)
                printUsage
                ;;
@@ -771,6 +775,11 @@ Debug "Read config script, setting defaults..."
 
 Debug "Setting vars..."
 
+if [ "$USE_BUILD_OPTIONS" = "1" ]  
+then
+       OPTS="$OPTS $BUILDOPTS"
+fi
+
 # If we are debugging, add "-g -O0" to the C/C++ flags
 if [ -n "$CHARMDEBUG" ]; then
        if [ -n "$CMK_BUILD_PYTHON" ]; then