Branch: b_cray

[fs/lustre-release.git] / build / lbuild

diff --git a/build/lbuild b/build/lbuild
index 33b83c1..e66516f 100755 (executable)
--- a/build/lbuild
+++ b/build/lbuild
@@ -40,6 +40,8 @@ DATE=$(date)
 USE_DATESTAMP=1
 RPMBUILD=
 
+export CC=${CC:-gcc}
+
 cleanup()
 {
     true
@@ -228,6 +230,8 @@ load_target()
     if [ "$EXTRA_VERSION_save" ] ; then
        EXTRA_VERSION="$EXTRA_VERSION_save"
     elif ! (( $RELEASE )) ; then
+       #remove the @VERSION@ (lustre version)
+       EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
        EXTRA_VERSION="${EXTRA_VERSION}-${TAG}.${TIMESTAMP}"
     fi
     # EXTRA_VERSION=${EXTRA_VERSION//-/_}