* configure.in: Allow sysroots to be relocated under $prefix as
	well as $exec_prefix.
	* configure: Regenerate.
This commit is contained in:
Richard Sandiford 2007-05-16 07:19:46 +00:00
parent 017f71b6e8
commit fa1e8d8e04
3 changed files with 26 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2007-05-16 Richard Sandiford <richard@codesourcery.com>
* configure.in: Allow sysroots to be relocated under $prefix as
well as $exec_prefix.
* configure: Regenerate.
2007-05-14 Andreas Schwab <schwab@suse.de>
* emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern):

17
ld/configure vendored
View File

@ -4198,17 +4198,20 @@ if test "${with_sysroot+set}" = set; then
TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
use_sysroot=yes
if test "x$exec_prefix" = xNONE; then
if test "x$prefix" = xNONE; then
test_prefix=/usr/local
else
test_prefix=$prefix
fi
if test "x$prefix" = xNONE; then
test_prefix=/usr/local
else
test_prefix=$exec_prefix
test_prefix=$prefix
fi
if test "x$exec_prefix" = xNONE; then
test_exec_prefix=$test_prefix
else
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"

View File

@ -41,17 +41,20 @@ AC_ARG_WITH(sysroot,
TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
use_sysroot=yes
if test "x$exec_prefix" = xNONE; then
if test "x$prefix" = xNONE; then
test_prefix=/usr/local
else
test_prefix=$prefix
fi
if test "x$prefix" = xNONE; then
test_prefix=/usr/local
else
test_prefix=$exec_prefix
test_prefix=$prefix
fi
if test "x$exec_prefix" = xNONE; then
test_exec_prefix=$test_prefix
else
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"