Ok, this should never be on....

[awesomized/libmemcached] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index abb117f7a21f35d8a01e94049255030e96acd3c8..a95cb85425af86762b4e5766fe931087bc21f27c 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -223,8 +223,16 @@ set_VENDOR_RELEASE ()
           echo "mountain_lion"
           VENDOR_RELEASE='mountain_lion'
           ;;
+        10.9)
+          echo "mavericks"
+          VENDOR_RELEASE='mavericks'
+          ;;
+        10.9.*)
+          echo "mavericks"
+          VENDOR_RELEASE='mavericks'
+          ;;
         *)
-          echo $VENDOR_RELEASE
+          echo $release
           VENDOR_RELEASE='unknown'
           ;;
       esac
@@ -396,6 +404,10 @@ run_configure ()
   # Arguments for configure
   local BUILD_CONFIGURE_ARG='' 
 
+  if $jenkins_build_environment; then
+    BUILD_CONFIGURE_ARG="--disable-silent-rules "
+  fi
+
   # If debug is set we enable both debug and asssert, otherwise we see if this is a VCS checkout and if so enable assert
   # Set ENV ASSERT in order to enable assert.
   # If we are doing a valgrind run, we always compile with assert disabled
@@ -420,10 +432,6 @@ run_configure ()
   ret=1;
   # If we are executing on OSX use CLANG, otherwise only use it if we find it in the ENV
   case $HOST_OS in
-    *-darwin-*)
-      run CC=clang CXX=clang++ $CONFIGURE "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=clang CXX=clang++ configure $BUILD_CONFIGURE_ARG"
-      ret=$?
-      ;;
     rhel-5*)
       command_exists 'gcc44' || die "Could not locate gcc44"
       run CC=gcc44 CXX=gcc44 $top_srcdir/configure "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=gcc44 CXX=gcc44 configure $BUILD_CONFIGURE_ARG"