diff --git a/build/auto-detect/auto-detect.sh b/build/auto-detect/auto-detect.sh
index 345fc2f3a..5185fd8af 100755
--- a/build/auto-detect/auto-detect.sh
+++ b/build/auto-detect/auto-detect.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like
@@ -41,7 +41,11 @@
 
 main()
 {
-	CC=gcc
+	if [ clang -v > /dev/null 2>&1 ]; then
+	    CC=clang
+	else
+	    CC=gcc
+    fi
 	CPUID_SRC=cpuid_x86.c
 	CPUID_BIN=blis_cpu_detect
 	ARCH=reference
@@ -59,12 +63,6 @@ main()
 	# of the distribution and the directory in which we are building.
 	cur_dirpath="."
 
-
-	OSNAME=`uname`
-	if [ $OSNAME = "Darwin" ]; then
-		CC=clang
-	fi
-
 	#
 	# Detect architecture by predefined macros
 	#
diff --git a/build/bump-version.sh b/build/bump-version.sh
index 6df894152..53cbe1825 100755
--- a/build/bump-version.sh
+++ b/build/bump-version.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like
diff --git a/build/check-test.sh b/build/check-test.sh
index fa7b4779a..6fb082a4c 100755
--- a/build/check-test.sh
+++ b/build/check-test.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like
diff --git a/build/gen-make-frags/gen-make-frag.sh b/build/gen-make-frags/gen-make-frag.sh
index 77e6dd5c4..19fdc5bd0 100755
--- a/build/gen-make-frags/gen-make-frag.sh
+++ b/build/gen-make-frags/gen-make-frag.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like
@@ -374,10 +374,6 @@ gen_mkfiles()
 
 read_mkfile_config()
 {
-	local index lname
-	declare -i count
-	
-	
 	# Read the file describing file suffixes.
 	src_file_suffixes=$(cat "${suffix_file}")
 
diff --git a/build/mirror-tree.sh b/build/mirror-tree.sh
index 3aae9ce35..813091fcf 100755
--- a/build/mirror-tree.sh
+++ b/build/mirror-tree.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like
diff --git a/build/templates/license.sh b/build/templates/license.sh
index 2ddf39ebf..3bf15c46c 100644
--- a/build/templates/license.sh
+++ b/build/templates/license.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # Copyright (C) 2017, Advanced Micro Devices, Inc.
 
diff --git a/build/update-version-file.sh b/build/update-version-file.sh
index 38e8d2088..23373022d 100755
--- a/build/update-version-file.sh
+++ b/build/update-version-file.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like