|
Line
Link Here
|
| 0 |
-- a/libltdl/config/ltmain.sh |
0 |
++ b/libltdl/config/ltmain.sh |
|
Lines 1424-1429
func_infer_tag ()
Link Here
|
| 1424 |
;; |
1429 |
;; |
| 1425 |
esac |
1430 |
esac |
| 1426 |
fi |
1431 |
fi |
|
|
1432 |
|
| 1433 |
# Gentoo hacks! https://bugs.gentoo.org/88596 |
| 1434 |
# If the active gcc is not the same as the live gcc, then recompute. |
| 1435 |
|
| 1436 |
# If the tag isn't gcc based, skip it. |
| 1437 |
if [ "$with_gcc" != "yes" ]; then |
| 1438 |
return 0 |
| 1439 |
fi |
| 1440 |
|
| 1441 |
# Some tags don't have any path info, so nothing to do. |
| 1442 |
if [ -z "$compiler_lib_search_dirs$predep_objects$postdep_objects$predeps$postdeps$compiler_lib_search_path" ]; then |
| 1443 |
return 0 |
| 1444 |
fi |
| 1445 |
|
| 1446 |
# Make sure this new compiler is also gcc based. If it isn't, |
| 1447 |
# then we can't support switching to it. |
| 1448 |
if ! "$@" --version 2>/dev/null | ${GREP} -q '^gcc\>'; then |
| 1449 |
return 0 |
| 1450 |
fi |
| 1451 |
|
| 1452 |
# If they're the same version, assume nothing has changed. |
| 1453 |
gentoo_active_ver=$("$@" -dumpversion 2>/dev/null) || return 0 |
| 1454 |
if [ "$gentoo_CC_version" = "$gentoo_active_ver" ]; then |
| 1455 |
return 0 |
| 1456 |
fi |
| 1457 |
|
| 1458 |
for gentoo_var in \ |
| 1459 |
compiler_lib_search_dirs \ |
| 1460 |
predep_objects \ |
| 1461 |
postdep_objects \ |
| 1462 |
predeps \ |
| 1463 |
postdeps \ |
| 1464 |
compiler_lib_search_path |
| 1465 |
do |
| 1466 |
eval $gentoo_var="\"\$(echo \"\$$gentoo_var\" | ${SED} \"s:$gentoo_CC_version:$gentoo_active_ver:g\")\"" |
| 1467 |
done |
| 1427 |
} |
1468 |
} |
| 1428 |
|
1469 |
|
| 1429 |
|
1470 |
|
| 1430 |
-- a/libltdl/m4/libtool.m4 |
1471 |
++ b/libltdl/m4/libtool.m4 |
|
Lines 881-886
_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
Link Here
|
| 881 |
_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl |
935 |
_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl |
| 882 |
_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl |
936 |
_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl |
| 883 |
|
937 |
|
|
|
938 |
# Hmm, should we do this for all tags or just the main one ? Probably safe |
| 939 |
# to assume that they're all the same version ... |
| 940 |
gentoo_CC_version= |
| 941 |
if test "$GCC" = yes; then |
| 942 |
gentoo_CC_version=$($CC -dumpversion 2>/dev/null) |
| 943 |
fi |
| 944 |
_LT_DECL([gentoo_CC_version], [gentoo_CC_version], [1], [The compiler version]) |
| 945 |
|
| 884 |
# If no C compiler was specified, use CC. |
946 |
# If no C compiler was specified, use CC. |
| 885 |
LTCC=${LTCC-"$CC"} |
947 |
LTCC=${LTCC-"$CC"} |
| 886 |
|
948 |
|
