Index: utils/release/test-release.sh
===================================================================
--- utils/release/test-release.sh	(revision 242455)
+++ utils/release/test-release.sh	(working copy)
@@ -12,7 +12,8 @@
 #
 #===------------------------------------------------------------------------===#
 
-if [ `uname -s` = "FreeBSD" ]; then
+System=`uname -s`
+if [ $System = "FreeBSD" ]; then
     MAKE=gmake
 else
     MAKE=make
@@ -54,8 +55,9 @@
     echo " -use-autoconf        Use autoconf instead of cmake"
 }
 
-if [ `uname -s` = "Darwin" ]; then
+if [ $System = "Darwin" -o $System = "FreeBSD" ]; then
   # compiler-rt doesn't yet build with CMake on Darwin.
+  # libcxxabi doesn't yet build with CMake on FreeBSD.
   use_autoconf="yes"
 fi
 
@@ -176,7 +178,7 @@
   fi
 }
 
-if [ `uname -s` != "Darwin" ]; then
+if [ $System != "Darwin" ]; then
   check_program_exists 'chrpath'
   check_program_exists 'file'
   check_program_exists 'objdump'
@@ -333,7 +335,7 @@
 # Clean RPATH. Libtool adds the build directory to the search path, which is
 # not necessary --- and even harmful --- for the binary packages we release.
 function clean_RPATH() {
-  if [ `uname -s` = "Darwin" ]; then
+  if [ $System = "Darwin" ]; then
     return
   fi
   local InstallPath="$1"