From 703bf84d324718b6af0a8818b4515193b2a71020 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 5 Apr 2012 19:34:15 +0000 Subject: [PATCH] Fix a problem in the target detection for Debian GNU/HURD git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154117 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 2 ++ configure | 2 ++ projects/sample/autoconf/configure.ac | 7 +++++++ projects/sample/configure | 7 +++++++ 4 files changed, 18 insertions(+) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 7f4b25e4c02..884a21b1410 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -300,6 +300,8 @@ AC_CACHE_CHECK([type of operating system we're going to target], llvm_cv_target_os_type="Interix" ;; *-*-linux*) llvm_cv_target_os_type="Linux" ;; + *-*-gnu*) + llvm_cv_target_os_type="GNU" ;; *-*-solaris*) llvm_cv_target_os_type="SunOS" ;; *-*-auroraux*) diff --git a/configure b/configure index 1e5e2c5998e..8ff4e62a61e 100755 --- a/configure +++ b/configure @@ -3816,6 +3816,8 @@ else llvm_cv_target_os_type="Interix" ;; *-*-linux*) llvm_cv_target_os_type="Linux" ;; + *-*-gnu*) + llvm_cv_target_os_type="GNU" ;; *-*-solaris*) llvm_cv_target_os_type="SunOS" ;; *-*-auroraux*) diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index a30cf96ecb9..c3a49d5b12e 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -167,6 +167,11 @@ AC_CACHE_CHECK([type of operating system we're going to host on], llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="Linux" llvm_cv_platform_type="Unix" ;; + *-*-gnu*) + llvm_cv_link_all_option="-Wl,--whole-archive" + llvm_cv_no_link_all_option="-Wl,--no-whole-archive" + llvm_cv_os_type="GNU" + llvm_cv_platform_type="Unix" ;; *-*-solaris*) llvm_cv_link_all_option="-Wl,-z,allextract" llvm_cv_no_link_all_option="-Wl,-z,defaultextract" @@ -236,6 +241,8 @@ AC_CACHE_CHECK([type of operating system we're going to target], llvm_cv_target_os_type="Interix" ;; *-*-linux*) llvm_cv_target_os_type="Linux" ;; + *-*-gnu*) + llvm_cv_target_os_type="GNU" ;; *-*-solaris*) llvm_cv_target_os_type="SunOS" ;; *-*-auroraux*) diff --git a/projects/sample/configure b/projects/sample/configure index 28fba4107e3..7c5e2ee37db 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -3681,6 +3681,11 @@ else llvm_cv_no_link_all_option="-Wl,--no-whole-archive" llvm_cv_os_type="Linux" llvm_cv_platform_type="Unix" ;; + *-*-gnu*) + llvm_cv_link_all_option="-Wl,--whole-archive" + llvm_cv_no_link_all_option="-Wl,--no-whole-archive" + llvm_cv_os_type="GNU" + llvm_cv_platform_type="Unix" ;; *-*-solaris*) llvm_cv_link_all_option="-Wl,-z,allextract" llvm_cv_no_link_all_option="-Wl,-z,defaultextract" @@ -3756,6 +3761,8 @@ else llvm_cv_target_os_type="Interix" ;; *-*-linux*) llvm_cv_target_os_type="Linux" ;; + *-*-gnu*) + llvm_cv_target_os_type="GNU" ;; *-*-solaris*) llvm_cv_target_os_type="SunOS" ;; *-*-auroraux*)