diff options
| author | unknown <joerg@trift2.> | 2007-12-28 15:26:55 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-12-28 15:26:55 +0100 |
| commit | 642adf40e1d96c9465d9911f42adcb7a63e269f5 (patch) | |
| tree | 02123bcbbae70e84cb2973365103fae99d6c0d2d /scripts | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| parent | be2c41aadf0338a2ccfae8232394f34dabf28266 (diff) | |
| download | mariadb-git-642adf40e1d96c9465d9911f42adcb7a63e269f5.tar.gz | |
Merge trift2.:/MySQL/M50/bug33536-5.0
into trift2.:/MySQL/M51/bug33536-5.1
scripts/make_binary_distribution.sh:
Manual merge of the fix for bug#33536 from 5.0 to 5.1,
the restructuring of this script makes automerge fail.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 8d3e2133a45..1e9ec362d76 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -218,11 +218,13 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then # If we compiled with gcc, copy libgcc.a to the dist as libmygcc.a # ---------------------------------------------------------------------- if [ x"@GXX@" = x"yes" ] ; then - gcclib=`@CC@ @CFLAGS@ --print-libgcc-file` - if [ $? -ne 0 ] ; then - echo "Warning: Couldn't find libgcc.a!" + gcclib=`@CC@ @CFLAGS@ --print-libgcc-file 2>/dev/null` || true + if [ -z "$gcclib" ] ; then + echo "Warning: Compiler doesn't tell libgcc.a!" + elif [ -f "$gcclib" ] ; then + $CP $gcclib $BASE/lib/libmygcc.a else - $CP $gcclib $DEST/lib/libmygcc.a + echo "Warning: Compiler result '$gcclib' not found / no file!" fi fi |