Fix leftover remote test failures from PR binutils/19020

[deliverable/binutils-gdb.git] / src-release.sh

diff --git a/src-release.sh b/src-release.sh
index 8229e15dbb823d3d47ba697834bc5ac74d172a1a..64fa4c2120bfb81a02d99bc4e73b8b10ea6e8592 100755 (executable)
--- a/src-release.sh
+++ b/src-release.sh
@@ -60,7 +60,7 @@ getver()
        bfd/configure --version | sed -n -e '1s,.* ,,p'
     elif test -f $tool/common/create-version.sh; then
        $tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
-       cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$//'
+       cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//'
         rm -f VER.tmp
     elif test -f $tool/version.in; then
        head -1 $tool/version.in
@@ -83,9 +83,7 @@ do_proto_toplev()
        <Makefile.in >tmp
     mv -f tmp Makefile.in
     #
-    ./configure --target=i386-pc-linux-gnu \
-       --with-target-subdir=. \
-       --disable-multilib
+    ./configure --target=i386-pc-linux-gnu
     $MAKE configure-host configure-target \
        ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
        CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
@@ -246,7 +244,8 @@ tar_compress()
     tool=$2
     support_files=$3
     compressors=$4
-    ver=$(getver $tool)
+    verdir=${5:-$tool}
+    ver=$(getver $verdir)
     do_proto_toplev $package $ver $tool "$support_files"
     do_md5sum
     do_tar $package $ver
@@ -297,13 +296,13 @@ gdb_release()
 }
 
 # Corresponding to the CVS "sim" module.
-SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms zlib"
+SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in gdb/common/create-version.sh makefile.vms zlib"
 sim_release()
 {
     compressors=$1
     package=sim
     tool=sim
-    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors"
+    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" gdb
 }
 
 usage()