diff --git a/build.sh b/build.sh
index 8ee378e..1ff7256 100755
--- a/build.sh
+++ b/build.sh
@@ -76,14 +76,16 @@ fi
 
 OSXCROSS_VERSION=0.10
 
+X86_64H_SUPPORTED=0
+
 case $SDK_VERSION in
   10.4*) TARGET=darwin8 ;;
   10.5*) TARGET=darwin9 ;;
   10.6*) TARGET=darwin10 ;;
   10.7*) TARGET=darwin11 ;;
-  10.8*) TARGET=darwin12 ;;
-  10.9*) TARGET=darwin13 ;;
-  10.10*) TARGET=darwin14 ;;
+  10.8*) TARGET=darwin12; X86_64H_SUPPORTED=1; ;;
+  10.9*) TARGET=darwin13; X86_64H_SUPPORTED=1; ;;
+  10.10*) TARGET=darwin14; X86_64H_SUPPORTED=1; ;;
   *) echo "Invalid SDK Version" && exit 1 ;;
 esac
 
@@ -186,10 +188,12 @@ popd &>/dev/null
 pushd $TARGET_DIR/bin &>/dev/null
 CCTOOLS=`find . -name "x86_64-apple-darwin*"`
 CCTOOLS=($CCTOOLS)
-for CCTOOL in ${CCTOOLS[@]}; do
-  CCTOOL_X86_64H=`echo "$CCTOOL" | sed 's/x86_64/x86_64h/g'`
-  ln -sf $CCTOOL $CCTOOL_X86_64H
-done
+if [ $X86_64H_SUPPORTED -eq 1 ]; then
+  for CCTOOL in ${CCTOOLS[@]}; do
+    CCTOOL_X86_64H=`echo "$CCTOOL" | sed 's/x86_64/x86_64h/g'`
+    ln -sf $CCTOOL $CCTOOL_X86_64H
+  done
+fi
 for CCTOOL in ${CCTOOLS[@]}; do
   CCTOOL_I386=`echo "$CCTOOL" | sed 's/x86_64/i386/g'`
   ln -sf $CCTOOL $CCTOOL_I386
@@ -301,6 +305,8 @@ rm -f $OSXCROSS_CONF $OSXCROSS_ENV
 
 echo "compiling wrapper ..."
 
+export X86_64H_SUPPORTED
+
 export OSXCROSS_VERSION
 export OSXCROSS_TARGET=$TARGET
 export OSXCROSS_OSX_VERSION_MIN=$OSX_VERSION_MIN
diff --git a/wrapper/build.sh b/wrapper/build.sh
index fee42ba..7cac6b5 100755
--- a/wrapper/build.sh
+++ b/wrapper/build.sh
@@ -9,7 +9,7 @@ set +e
 if [ -z "$OSXCROSS_VERSION" ]; then
   `../target/bin/osxcross-conf 2>/dev/null`
 
-  if [ -n "$OSXCROSS_SDK_VERSION" ] ||
+  if [ -n "$OSXCROSS_SDK_VERSION" ] &&
      [ `osxcross-cmp $OSXCROSS_SDK_VERSION ">=" 10.8` -eq 1 ]; then
     X86_64H_SUPPORTED=1
   fi
@@ -46,7 +46,7 @@ function create_wrapper_link
   verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
     "x86_64-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}"
 
-  if [ -n "$X86_64H_SUPPORTED" ] &&
+  if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] &&
      ([[ $1 != gcc* ]] && [[ $1 != g++* ]]); then
     verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
       "x86_64h-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}"
@@ -58,7 +58,7 @@ function create_wrapper_link
     verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
       "o64-${1}${EXESUFFIX}"
 
-    if [ -n "$X86_64H_SUPPORTED" ] &&
+    if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] &&
        ([[ $1 != gcc* ]] && [[ $1 != g++* ]]); then
       verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
         "o64h-${1}${EXESUFFIX}"