diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-04-28 20:15:00 +0000 |
|---|---|---|
| committer | Bernd Edlinger <edlinger@gcc.gnu.org> | 2017-04-28 20:15:00 +0000 |
| commit | 0c90d48b346dfd6d41ceebaa58f2dd67c8fc5993 (patch) | |
| tree | 6154a7334bc509d3a4008c2bc9a26da4f4693ff5 /gcc/configure | |
| parent | 4accc823533141ba3496d7edf62ec32a02faa8a2 (diff) | |
| download | gcc-0c90d48b346dfd6d41ceebaa58f2dd67c8fc5993.zip gcc-0c90d48b346dfd6d41ceebaa58f2dd67c8fc5993.tar.gz gcc-0c90d48b346dfd6d41ceebaa58f2dd67c8fc5993.tar.bz2 | |
configure.ac (SYSTEM_HEADER_DIR, [...]): Set correctly.
2017-04-28 Bernd Edlinger <bernd.edlinger@hotmail.de>
* configure.ac (SYSTEM_HEADER_DIR, BUILD_SYSTEM_HEADER_DIR,
target_header_dir): Set correctly.
* configure: Regenerated.
* Makefile.in (BUILD_SYSTEM_HEADER_DIR): New make variabe.
(LIMITS_H_TEST, if_multiarch, stmp-fixinc): Use BUILD_SYSTEM_HEADER_DIR
instead of SYSTEM_HEADER_DIR.
From-SVN: r247397
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 53 |
1 files changed, 21 insertions, 32 deletions
diff --git a/gcc/configure b/gcc/configure index ea73b15..bde3dd8 100755 --- a/gcc/configure +++ b/gcc/configure @@ -719,6 +719,7 @@ BUILD_CFLAGS CXX_FOR_BUILD CC_FOR_BUILD inhibit_libc +BUILD_SYSTEM_HEADER_DIR SYSTEM_HEADER_DIR ALL CROSS @@ -12214,41 +12215,29 @@ done CROSS= ALL=all.internal SYSTEM_HEADER_DIR='$(NATIVE_SYSTEM_HEADER_DIR)' +BUILD_SYSTEM_HEADER_DIR=$SYSTEM_HEADER_DIR -if test "x$with_build_sysroot" != x; then - build_system_header_dir=$with_build_sysroot'$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' -else - # This value is used, even on a native system, because - # CROSS_SYSTEM_HEADER_DIR is just - # $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR). - build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)' -fi +if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x || + test x$build != x$host || test "x$with_build_sysroot" != x; then + if test "x$with_build_sysroot" != x; then + BUILD_SYSTEM_HEADER_DIR=$with_build_sysroot'$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' + else + BUILD_SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)' + fi -if test x$host != x$target -then - CROSS="-DCROSS_DIRECTORY_STRUCTURE" - ALL=all.cross - SYSTEM_HEADER_DIR=$build_system_header_dir - case $target in - *-*-mingw*) - if test "x$with_headers" = x; then - with_headers=yes - fi - ;; - *) - ;; - esac -elif test "x$TARGET_SYSTEM_ROOT" != x; then - SYSTEM_HEADER_DIR=$build_system_header_dir -fi + if test x$host != x$target + then + CROSS="-DCROSS_DIRECTORY_STRUCTURE" + ALL=all.cross + SYSTEM_HEADER_DIR=$BUILD_SYSTEM_HEADER_DIR + elif test "x$TARGET_SYSTEM_ROOT" != x; then + SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)' + fi -if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then - if test "x$with_headers" != x && test "x$with_headers" != xyes; then - target_header_dir=$with_headers + if test "x$with_build_sysroot" != "x"; then + target_header_dir="${with_build_sysroot}${native_system_header_dir}" elif test "x$with_sysroot" = x; then 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="${test_exec_prefix}/${target_noncanonical}/sys-root${native_system_header_dir}" else @@ -18433,7 +18422,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18436 "configure" +#line 18425 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18539,7 +18528,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18542 "configure" +#line 18531 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |