diff options
| author | Richard Sandiford <richard@codesourcery.com> | 2007-05-16 07:14:40 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2007-05-16 07:14:40 +0000 |
| commit | 748670c25bb0d41ecb89f110339a061ee8df2a1d (patch) | |
| tree | fe49b9d16149cd117c788d0fee79262f0772c967 | |
| parent | ee12b57dc3dd48cd9af1db09f3183eff456a994b (diff) | |
| download | gcc-748670c25bb0d41ecb89f110339a061ee8df2a1d.zip gcc-748670c25bb0d41ecb89f110339a061ee8df2a1d.tar.gz gcc-748670c25bb0d41ecb89f110339a061ee8df2a1d.tar.bz2 | |
configure.ac: Allow sysroots to be relocated under $prefix as well as $exec_prefix.
gcc/
* configure.ac: Allow sysroots to be relocated under $prefix as
well as $exec_prefix.
* configure: Regenerate.
From-SVN: r124762
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 17 | ||||
| -rw-r--r-- | gcc/configure.ac | 15 |
3 files changed, 25 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9b67075..847d10d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2007-05-16 Richard Sandiford <richard@codesourcery.com> + * configure.ac: Allow sysroots to be relocated under $prefix as + well as $exec_prefix. + * configure: Regenerate. + +2007-05-16 Richard Sandiford <richard@codesourcery.com> + Revert: 2007-05-12 Richard Sandiford <richard@codesourcery.com> diff --git a/gcc/configure b/gcc/configure index b3aa2b0..a11f675 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7172,17 +7172,20 @@ if test "${with_sysroot+set}" = set; then TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - test_prefix=/usr/local - else - test_prefix=$prefix - fi + test_exec_prefix=$test_prefix else - test_prefix=$exec_prefix + test_exec_prefix=$exec_prefix fi case ${TARGET_SYSTEM_ROOT} in "${test_prefix}"|"${test_prefix}/"*|\ + "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ + '${prefix}'|'${prefix}/'*|\ '${exec_prefix}'|'${exec_prefix}/'*) t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" TARGET_SYSTEM_ROOT_DEFINE="$t" @@ -7672,7 +7675,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:7675: version of makeinfo is $ac_prog_version" >&5 + echo "configure:7678: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[4-9]*) diff --git a/gcc/configure.ac b/gcc/configure.ac index 708ce16..295b8e7 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -790,17 +790,20 @@ AC_ARG_WITH(sysroot, TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - test_prefix=/usr/local - else - test_prefix=$prefix - fi + test_exec_prefix=$test_prefix else - test_prefix=$exec_prefix + test_exec_prefix=$exec_prefix fi case ${TARGET_SYSTEM_ROOT} in "${test_prefix}"|"${test_prefix}/"*|\ + "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ + '${prefix}'|'${prefix}/'*|\ '${exec_prefix}'|'${exec_prefix}/'*) t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" TARGET_SYSTEM_ROOT_DEFINE="$t" |