From 6e9b5eb51bb623995c90295d265a7682277653a1 Mon Sep 17 00:00:00 2001
From: Sebastian Pop <spop@codeaurora.org>
Date: Thu, 5 Jan 2012 18:28:46 +0000
Subject: revert r147542 after comments from Joerg Sonnenberger

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147608 91177308-0d34-0410-b5e6-96231b3b80d8
---
 projects/sample/autoconf/configure.ac |  2 --
 projects/sample/configure             | 13 ++++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'projects/sample')

diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac
index 3fd02578c4..a19e87ddf9 100644
--- a/projects/sample/autoconf/configure.ac
+++ b/projects/sample/autoconf/configure.ac
@@ -1390,8 +1390,6 @@ AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR",
                    [Installation directory for man pages])
 AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME",
                    [Time at which LLVM was configured])
-AC_DEFINE_UNQUOTED(LLVM_HOST_TRIPLE, "$host",
-                   [Host triple LLVM will run on])
 AC_DEFINE_UNQUOTED(LLVM_DEFAULT_TARGET_TRIPLE, "$target",
                    [Target triple LLVM will generate code for by default])
 
diff --git a/projects/sample/configure b/projects/sample/configure
index f64383b3bd..860faa2927 100755
--- a/projects/sample/configure
+++ b/projects/sample/configure
@@ -8854,7 +8854,7 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1.*)
+freebsd1*)
   dynamic_linker=no
   ;;
 
@@ -8877,7 +8877,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -8895,7 +8895,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10409,7 +10409,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10412 "configure"
+#line 10423 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20818,11 +20818,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define LLVM_HOST_TRIPLE "$host"
-_ACEOF
-
-
 cat >>confdefs.h <<_ACEOF
 #define LLVM_DEFAULT_TARGET_TRIPLE "$target"
 _ACEOF
-- 
cgit v1.2.3