configure
changeset 9638 a30b6998c1d8
parent 9626 44e4400c1044
child 9657 fbc01731d914
     1.1 --- a/configure	Tue May 26 19:34:56 2015 -0300
     1.2 +++ b/configure	Tue May 26 19:54:06 2015 -0400
     1.3 @@ -9912,13 +9912,20 @@
     1.4      ;;
     1.5    esac
     1.6    # Ok, now we have the path, separated by spaces, we can step through it
     1.7 -  # and add multilib dir if necessary.
     1.8 +  # and add multilib dir if necessary...
     1.9    lt_tmp_lt_search_path_spec=
    1.10 -  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
    1.11 +  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
    1.12 +  # ...but if some path already ends with the multilib dir we assume
    1.13 +  # that all is fine and trust -print-search-dirs as is (GCC 4.2 or newer).
    1.14 +  case "$lt_multi_os_dir; $lt_search_path_spec " in
    1.15 +  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
    1.16 +    lt_multi_os_dir=
    1.17 +    ;;
    1.18 +  esac
    1.19    for lt_sys_path in $lt_search_path_spec; do
    1.20 -    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
    1.21 -      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
    1.22 -    else
    1.23 +    if test -d "$lt_sys_path$lt_multi_os_dir"; then
    1.24 +      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
    1.25 +    elif test -n "$lt_multi_os_dir"; then
    1.26        test -d "$lt_sys_path" && \
    1.27  	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
    1.28      fi