summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-12-28 15:50:44 +0100
committerunknown <joerg@trift2.>2007-12-28 15:50:44 +0100
commit8b1ff4ef587b610848e87469f40d7d36b39d431d (patch)
tree4d03cac5142370cfd5fc0657980d37497b42a3ae /scripts
parent1e41f36c5671df879062d1ea52c8b57b6fc2d44f (diff)
parent642adf40e1d96c9465d9911f42adcb7a63e269f5 (diff)
downloadmariadb-git-8b1ff4ef587b610848e87469f40d7d36b39d431d.tar.gz
Merge trift2.:/MySQL/M51/bug33536-5.1
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh10
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