diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-12-10 14:19:11 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-12-10 14:19:11 -0800 |
| commit | 3bacc7c86f7c9f7f40de4f6a7131ee72fae59465 (patch) | |
| tree | d8fdd66c7e1f8a9d6592be58ab7f6ed8bd1e119f | |
| parent | 7e9da188a1163eb18cf49ef9a813f1e25a81c737 (diff) | |
| download | glibc-hjl/pr14941.tar.gz | |
Support multiarch under OS directoryhjl/pr14941
| -rw-r--r-- | ChangeLog.pr14941 | 5 | ||||
| -rwxr-xr-x | configure | 62 | ||||
| -rw-r--r-- | configure.in | 62 |
3 files changed, 71 insertions, 58 deletions
diff --git a/ChangeLog.pr14941 b/ChangeLog.pr14941 new file mode 100644 index 0000000000..90570803bf --- /dev/null +++ b/ChangeLog.pr14941 @@ -0,0 +1,5 @@ +2012-12-10 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #14941] + * configure.in: Add m0sub and msub for multiarch check. + * configure: Regenerated. @@ -4347,36 +4347,40 @@ sysnames_add_ons= sysnames= for b in $base ''; do for m0 in $mach ''; do - for v in /$vendor ''; do - test "$v" = / && continue - for o in /$ostry ''; do - test "$o" = / && continue - for m in $multi_arch_d $mach ''; do - for d in $add_ons_pfx ''; do - for a in $add_ons_sfx ''; do - if test -n "$m0$m0sub$b$v$o$m$msub"; then - try_srcdir="${srcdir}/" - case "$d" in - /*) try_srcdir= ;; - esac - try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a" - test -n "$enable_debug_configure" && - echo "$0 DEBUG: try $try" >&2 - if test -d "$try_srcdir$try"; then - sysnames="$sysnames $try" - { test -n "$o" || test -n "$b"; } && os_used=t - { test -n "$m" || test -n "$m0"; } && machine_used=t - case x${m0:-$m} in - x*/$submachine) submachine_used=t ;; - esac - if test -n "$d"; then - case "$sysnames_add_ons" in - *" $d "*) ;; - *|'') sysnames_add_ons="$sysnames_add_ons $d" ;; + for m0sub in $mach ''; do + for v in /$vendor ''; do + test "$v" = / && continue + for o in /$ostry ''; do + test "$o" = / && continue + for m in $multi_arch_d $mach ''; do + for msub in $multi_arch_d $mach ''; do + for d in $add_ons_pfx ''; do + for a in $add_ons_sfx ''; do + if test -n "$m0$m0sub$b$v$o$m$msub"; then + try_srcdir="${srcdir}/" + case "$d" in + /*) try_srcdir= ;; esac - fi - fi - fi + try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a" + test -n "$enable_debug_configure" && + echo "$0 DEBUG: try $try" >&2 + if test -d "$try_srcdir$try"; then + sysnames="$sysnames $try" + { test -n "$o" || test -n "$b"; } && os_used=t + { test -n "$m" || test -n "$m0"; } && machine_used=t + case x${m0:-$m} in + x*/$submachine) submachine_used=t ;; + esac + if test -n "$d"; then + case "$sysnames_add_ons" in + *" $d "*) ;; + *|'') sysnames_add_ons="$sysnames_add_ons $d" ;; + esac + fi + fi + fi + done + done done done done diff --git a/configure.in b/configure.in index d369382264..e0f391d8d6 100644 --- a/configure.in +++ b/configure.in @@ -695,36 +695,40 @@ sysnames_add_ons= sysnames= for b in $base ''; do for m0 in $mach ''; do - for v in /$vendor ''; do - test "$v" = / && continue - for o in /$ostry ''; do - test "$o" = / && continue - for m in $multi_arch_d $mach ''; do - for d in $add_ons_pfx ''; do - for a in $add_ons_sfx ''; do - if test -n "$m0$m0sub$b$v$o$m$msub"; then - try_srcdir="${srcdir}/" - case "$d" in - /*) try_srcdir= ;; - esac - try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a" - test -n "$enable_debug_configure" && - echo "$0 [DEBUG]: try $try" >&2 - if test -d "$try_srcdir$try"; then - sysnames="$sysnames $try" - { test -n "$o" || test -n "$b"; } && os_used=t - { test -n "$m" || test -n "$m0"; } && machine_used=t - case x${m0:-$m} in - x*/$submachine) submachine_used=t ;; - esac - if test -n "$d"; then - case "$sysnames_add_ons" in - *" $d "*) ;; - *|'') sysnames_add_ons="$sysnames_add_ons $d" ;; + for m0sub in $mach ''; do + for v in /$vendor ''; do + test "$v" = / && continue + for o in /$ostry ''; do + test "$o" = / && continue + for m in $multi_arch_d $mach ''; do + for msub in $multi_arch_d $mach ''; do + for d in $add_ons_pfx ''; do + for a in $add_ons_sfx ''; do + if test -n "$m0$m0sub$b$v$o$m$msub"; then + try_srcdir="${srcdir}/" + case "$d" in + /*) try_srcdir= ;; esac - fi - fi - fi + try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a" + test -n "$enable_debug_configure" && + echo "$0 [DEBUG]: try $try" >&2 + if test -d "$try_srcdir$try"; then + sysnames="$sysnames $try" + { test -n "$o" || test -n "$b"; } && os_used=t + { test -n "$m" || test -n "$m0"; } && machine_used=t + case x${m0:-$m} in + x*/$submachine) submachine_used=t ;; + esac + if test -n "$d"; then + case "$sysnames_add_ons" in + *" $d "*) ;; + *|'') sysnames_add_ons="$sysnames_add_ons $d" ;; + esac + fi + fi + fi + done + done done done done |