diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-01-26 16:28:32 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-01-26 16:28:32 +0400 |
| commit | fddf3c397913f3254bd2adf0d1d7ad4cde586355 (patch) | |
| tree | 2a28ececfe295dc26ec37a1651df098dac898f95 /support-files/mysql.spec.sh | |
| parent | 6d04643ab3b8ed31a693ac1df6dadc7da42c53b8 (diff) | |
| parent | 0c302993e684b977e0c925b2332019f37feada8d (diff) | |
| download | mariadb-git-fddf3c397913f3254bd2adf0d1d7ad4cde586355.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
into mysql.com:/home/gluh/MySQL/Merge/4.1
sql/item_func.cc:
Auto merged
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 083b89d9275..02176ea0b41 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -340,7 +340,7 @@ install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/ # 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 @@ -726,6 +726,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. + * Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com> - Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql" |