diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-11-09 15:14:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-09 15:14:11 +0000 |
| commit | 08b7f46c74f4cbe6a04759a2974bfcf91f7e737b (patch) | |
| tree | da4acf5ea2c3f79908d6cb32cbc651369cee0703 /sys-devel/libtool/files | |
| parent | Fixed tdfxvid output logic as per bug #64218. (diff) | |
| download | historical-08b7f46c74f4cbe6a04759a2974bfcf91f7e737b.tar.gz historical-08b7f46c74f4cbe6a04759a2974bfcf91f7e737b.tar.bz2 historical-08b7f46c74f4cbe6a04759a2974bfcf91f7e737b.zip | |
Add another check to the CC tag guessing.
Diffstat (limited to 'sys-devel/libtool/files')
| -rw-r--r-- | sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch | 9 | ||||
| -rw-r--r-- | sys-devel/libtool/files/digest-libtool-1.5.2-r7 (renamed from sys-devel/libtool/files/digest-libtool-1.5.2-r6) | 0 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch index 82620fbadea3..30bfbd5d58d1 100644 --- a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch +++ b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch @@ -7,8 +7,8 @@ + # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' + trimedcc="${CC/${host}-}" case "$base_compile " in -+ "gcc "* | " gcc "*) tagname=CC ; break ;; - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ++ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\ + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*) # The compiler in the base compile command matches @@ -18,12 +18,11 @@ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then # Evaluate the configuration. eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" -- case $base_compile in -- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) + # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' + trimedcc="${CC/${host}-}" -+ case "$base_compile " in -+ "gcc "* | " gcc "*) tagname=CC ; break ;; + case $base_compile in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ++ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) tagname=CC ; break ;; + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\ + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*) # The compiler in $compile_command matches diff --git a/sys-devel/libtool/files/digest-libtool-1.5.2-r6 b/sys-devel/libtool/files/digest-libtool-1.5.2-r7 index 301451dc934e..301451dc934e 100644 --- a/sys-devel/libtool/files/digest-libtool-1.5.2-r6 +++ b/sys-devel/libtool/files/digest-libtool-1.5.2-r7 |