diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2012-07-07 00:26:08 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@axis.com> | 2012-07-07 00:26:08 +0000 |
| commit | 36b519ff9692fa6f730b8cf0ad963785797b01e9 (patch) | |
| tree | 410ed887d0402f88584c1e5a16b2e49217ab4ad5 /gcc/configure | |
| parent | a0d2af3dd509d267da84b8d54816fa632f81e066 (diff) | |
Fix configure test for "stack protector support in target C library".
* configure.ac (test_prefix, test_exec_prefix): Move setting from
inside sysroot handling to before and outside it.
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@189345 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/gcc/configure b/gcc/configure index af08a49b349..817b3d6e88b 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7236,6 +7236,17 @@ fi +if test "x$prefix" = xNONE; then + test_prefix=/usr/local +else + test_prefix=$prefix +fi +if test "x$exec_prefix" = xNONE; then + test_exec_prefix=$test_prefix +else + test_exec_prefix=$exec_prefix +fi + # Check whether --with-sysroot was given. if test "${with_sysroot+set}" = set; then : @@ -7248,16 +7259,6 @@ 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 - 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}/"*|\ @@ -17971,7 +17972,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17974 "configure" +#line 17975 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18077,7 +18078,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18080 "configure" +#line 18081 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -26631,11 +26632,11 @@ if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then if test "x$with_headers" != x; then target_header_dir=$with_headers elif test "x$with_sysroot" = x; then - target_header_dir="${exec_prefix}/${target_noncanonical}/sys-include" + target_header_dir="${test_exec_prefix}/${target_noncanonical}/sys-include" elif test "x$with_build_sysroot" != "x"; then target_header_dir="${with_build_sysroot}${native_system_header_dir}" elif test "x$with_sysroot" = xyes; then - target_header_dir="${exec_prefix}/${target_noncanonical}/sys-root${native_system_header_dir}" + target_header_dir="${test_exec_prefix}/${target_noncanonical}/sys-root${native_system_header_dir}" else target_header_dir="${with_sysroot}${native_system_header_dir}" fi |