diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-01-05 17:30:40 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-01-05 17:30:40 +0100 |
| commit | 0275fa0eb235e56af21282d43f2d9ed3bc4eee41 (patch) | |
| tree | 3e836d9784cda5a4a68e8e619207ea0dff64b21e /scripts | |
| parent | 9aaac61e8517e438fe7c6fb9beb08aec11c01d58 (diff) | |
| parent | 6f3343eeb990d70c9f60bd6077615b93f8b5fc55 (diff) | |
| download | mariadb-git-0275fa0eb235e56af21282d43f2d9ed3bc4eee41.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
- Put back "libmygcc.a", found no real reason it was removed.
- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c033a25ef30..f457dbfd98e 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -369,7 +369,7 @@ BASE=$BASE2 # if [ x"@GXX@" = x"yes" ] ; then - gcclib=`@CC@ --print-libgcc-file` + gcclib=`@CC@ @CFLAGS@ --print-libgcc-file` if [ $? -ne 0 ] ; then echo "Warning: Couldn't find libgcc.a!" else |