aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre@debian.org>2012-04-05 19:34:15 +0000
committerSylvestre Ledru <sylvestre@debian.org>2012-04-05 19:34:15 +0000
commit703bf84d324718b6af0a8818b4515193b2a71020 (patch)
treecce85ced96fd2969f90461d070906ce63bac1ecc
parent1d7e8c6148a4356c16745f6496c38c737bd37c02 (diff)
downloadexternal_llvm-703bf84d324718b6af0a8818b4515193b2a71020.zip
external_llvm-703bf84d324718b6af0a8818b4515193b2a71020.tar.gz
external_llvm-703bf84d324718b6af0a8818b4515193b2a71020.tar.bz2
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
-rw-r--r--autoconf/configure.ac2
-rwxr-xr-xconfigure2
-rw-r--r--projects/sample/autoconf/configure.ac7
-rwxr-xr-xprojects/sample/configure7
4 files changed, 18 insertions, 0 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 7f4b25e..884a21b 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 1e5e2c5..8ff4e62 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 a30cf96..c3a49d5 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 28fba41..7c5e2ee 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*)