summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorkent@mysql.com/kent-amd64.(none) <>2007-01-05 16:57:23 +0100
committerkent@mysql.com/kent-amd64.(none) <>2007-01-05 16:57:23 +0100
commitfa5a359f07ef1fffdfc7e2a4b73b13226279a248 (patch)
treee5bfc7b313d3bbe1a989bf817a5d9ce44d439bb3 /support-files
parent8941159ed81803936c7cba1adf5c15678f699c2c (diff)
parent528b457644eb6907c9b25c5842d9824451ca6091 (diff)
downloadmariadb-git-fa5a359f07ef1fffdfc7e2a4b73b13226279a248.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 59369f0de35..528b1f2746b 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -362,7 +362,7 @@ fi
# Include libgcc.a in the devel subpackage (BUG 4921)
if expr "$CC" : ".*gcc.*" > /dev/null ;
then
- libgcc=`$CC --print-libgcc-file`
+ libgcc=`$CC $CFLAGS --print-libgcc-file`
if [ -f $libgcc ]
then
%define have_libgcc 1
@@ -755,6 +755,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
+
+- 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.
+
* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.