Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-08 02:55:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

only create x86_64h symlinks when the 10.8 (or later) SDK is used #2

Browse Source 
forgot to test it with 'rm -rf target'...
This commit is contained in:
Thomas Pöchtrager 2015-06-27 20:40:13 +02:00
parent 698ffd6bec
commit 56eba88a9b
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.sh
View File

@ -76,14 +76,16 @@ fi
OSXCROSS_VERSION=0.10 OSXCROSS_VERSION=0.10
X86_64H_SUPPORTED=0
case $SDK_VERSION in case $SDK_VERSION in
10.4*) TARGET=darwin8 ;; 10.4*) TARGET=darwin8 ;;
10.5*) TARGET=darwin9 ;; 10.5*) TARGET=darwin9 ;;
10.6*) TARGET=darwin10 ;; 10.6*) TARGET=darwin10 ;;
10.7*) TARGET=darwin11 ;; 10.7*) TARGET=darwin11 ;;
10.8*) TARGET=darwin12 ;; 10.8*) TARGET=darwin12; X86_64H_SUPPORTED=1; ;;
10.9*) TARGET=darwin13 ;; 10.9*) TARGET=darwin13; X86_64H_SUPPORTED=1; ;;
10.10*) TARGET=darwin14 ;; 10.10*) TARGET=darwin14; X86_64H_SUPPORTED=1; ;;
*) echo "Invalid SDK Version" && exit 1 ;; *) echo "Invalid SDK Version" && exit 1 ;;
esac esac
@ -186,10 +188,12 @@ popd &>/dev/null
pushd $TARGET_DIR/bin &>/dev/null pushd $TARGET_DIR/bin &>/dev/null
CCTOOLS=`find . -name "x86_64-apple-darwin*"` CCTOOLS=`find . -name "x86_64-apple-darwin*"`
CCTOOLS=($CCTOOLS) CCTOOLS=($CCTOOLS)
for CCTOOL in ${CCTOOLS[@]}; do if [ $X86_64H_SUPPORTED -eq 1 ]; then
CCTOOL_X86_64H=`echo "$CCTOOL" | sed 's/x86_64/x86_64h/g'` for CCTOOL in ${CCTOOLS[@]}; do
ln -sf $CCTOOL $CCTOOL_X86_64H CCTOOL_X86_64H=`echo "$CCTOOL" | sed 's/x86_64/x86_64h/g'`
done ln -sf $CCTOOL $CCTOOL_X86_64H
done
fi
for CCTOOL in ${CCTOOLS[@]}; do for CCTOOL in ${CCTOOLS[@]}; do
CCTOOL_I386=`echo "$CCTOOL" | sed 's/x86_64/i386/g'` CCTOOL_I386=`echo "$CCTOOL" | sed 's/x86_64/i386/g'`
ln -sf $CCTOOL $CCTOOL_I386 ln -sf $CCTOOL $CCTOOL_I386
@ -301,6 +305,8 @@ rm -f $OSXCROSS_CONF $OSXCROSS_ENV
echo "compiling wrapper ..." echo "compiling wrapper ..."
export X86_64H_SUPPORTED
export OSXCROSS_VERSION export OSXCROSS_VERSION
export OSXCROSS_TARGET=$TARGET export OSXCROSS_TARGET=$TARGET
export OSXCROSS_OSX_VERSION_MIN=$OSX_VERSION_MIN export OSXCROSS_OSX_VERSION_MIN=$OSX_VERSION_MIN

6
wrapper/build.sh
View File

@ -9,7 +9,7 @@ set +e
if [ -z "$OSXCROSS_VERSION" ]; then if [ -z "$OSXCROSS_VERSION" ]; then
`../target/bin/osxcross-conf 2>/dev/null` `../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 [ `osxcross-cmp $OSXCROSS_SDK_VERSION ">=" 10.8` -eq 1 ]; then
X86_64H_SUPPORTED=1 X86_64H_SUPPORTED=1
fi fi
@ -46,7 +46,7 @@ function create_wrapper_link
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"x86_64-apple-${OSXCROSS_TARGET}-${1}${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 ([[ $1 != gcc* ]] && [[ $1 != g++* ]]); then
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"x86_64h-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}" "x86_64h-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}"
@ -58,7 +58,7 @@ function create_wrapper_link
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"o64-${1}${EXESUFFIX}" "o64-${1}${EXESUFFIX}"
if [ -n "$X86_64H_SUPPORTED" ] && if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] &&
([[ $1 != gcc* ]] && [[ $1 != g++* ]]); then ([[ $1 != gcc* ]] && [[ $1 != g++* ]]); then
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"o64h-${1}${EXESUFFIX}" "o64h-${1}${EXESUFFIX}"