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

Cygwin: Avoid symlinks and append .exe to executables (#91)

Browse Source
This commit is contained in:
Thomas Pöchtrager 2016-10-29 19:26:05 +02:00
parent 86879571d3
commit 98a7b55070
4 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -168,12 +168,12 @@ CCTOOLS=($CCTOOLS)
if [ $X86_64H_SUPPORTED -eq 1 ]; then if [ $X86_64H_SUPPORTED -eq 1 ]; then
for CCTOOL in ${CCTOOLS[@]}; do for CCTOOL in ${CCTOOLS[@]}; do
CCTOOL_X86_64H=$(echo "$CCTOOL" | $SED 's/x86_64/x86_64h/g') CCTOOL_X86_64H=$(echo "$CCTOOL" | $SED 's/x86_64/x86_64h/g')
ln -sf $CCTOOL $CCTOOL_X86_64H create_symlink $CCTOOL $CCTOOL_X86_64H
done done
fi 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 create_symlink $CCTOOL $CCTOOL_I386
done done
popd &>/dev/null popd &>/dev/null
@ -182,9 +182,9 @@ fi
# MacPorts symlinks # MacPorts symlinks
pushd $TARGET_DIR/bin &>/dev/null # The BSD ln command doesn't support '-r' pushd $TARGET_DIR/bin &>/dev/null # The BSD ln command doesn't support '-r'
ln -sf $BASE_DIR/tools/osxcross-macports osxcross-macports create_symlink $BASE_DIR/tools/osxcross-macports osxcross-macports
ln -sf $BASE_DIR/tools/osxcross-macports osxcross-mp create_symlink $BASE_DIR/tools/osxcross-macports osxcross-mp
ln -sf $BASE_DIR/tools/osxcross-macports omp create_symlink $BASE_DIR/tools/osxcross-macports omp
popd &>/dev/null popd &>/dev/null
SDK=$(ls $TARBALL_DIR/MacOSX$SDK_VERSION*) SDK=$(ls $TARBALL_DIR/MacOSX$SDK_VERSION*)
@ -265,7 +265,7 @@ fi
pushd $SDK_DIR/MacOSX$SDK_VERSION.sdk &>/dev/null pushd $SDK_DIR/MacOSX$SDK_VERSION.sdk &>/dev/null
set +e set +e
ln -s \ create_symlink \
$SDK_DIR/MacOSX$SDK_VERSION.sdk/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/std*.h \ $SDK_DIR/MacOSX$SDK_VERSION.sdk/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/std*.h \
usr/include 2>/dev/null usr/include 2>/dev/null
[ ! -f "usr/include/float.h" ] && cp -f $BASE_DIR/oclang/quirks/float.h usr/include [ ! -f "usr/include/float.h" ] && cp -f $BASE_DIR/oclang/quirks/float.h usr/include

16
build_gcc.sh
View File

@ -128,12 +128,18 @@ source tools/tools.sh
pushd $OSXCROSS_TARGET_DIR/bin &>/dev/null pushd $OSXCROSS_TARGET_DIR/bin &>/dev/null
if [ ! -f i386-apple-$OSXCROSS_TARGET-base-gcc ]; then if [ ! -f i386-apple-$OSXCROSS_TARGET-base-gcc$EXESUFFIX ]; then
mv x86_64-apple-$OSXCROSS_TARGET-gcc x86_64-apple-$OSXCROSS_TARGET-base-gcc mv x86_64-apple-$OSXCROSS_TARGET-gcc$EXESUFFIX \
mv x86_64-apple-$OSXCROSS_TARGET-g++ x86_64-apple-$OSXCROSS_TARGET-base-g++ x86_64-apple-$OSXCROSS_TARGET-base-gcc$EXESUFFIX
ln -sf x86_64-apple-$OSXCROSS_TARGET-base-gcc i386-apple-$OSXCROSS_TARGET-base-gcc mv x86_64-apple-$OSXCROSS_TARGET-g++$EXESUFFIX \
ln -sf x86_64-apple-$OSXCROSS_TARGET-base-g++ i386-apple-$OSXCROSS_TARGET-base-g++ x86_64-apple-$OSXCROSS_TARGET-base-g++$EXESUFFIX
create_symlink x86_64-apple-$OSXCROSS_TARGET-base-gcc$EXESUFFIX \
i386-apple-$OSXCROSS_TARGET-base-gcc$EXESUFFIX
create_symlink x86_64-apple-$OSXCROSS_TARGET-base-g++$EXESUFFIX \
i386-apple-$OSXCROSS_TARGET-base-g++$EXESUFFIX
fi fi
echo "compiling wrapper ..." echo "compiling wrapper ..."

14
tools/tools.sh
View File

@ -149,13 +149,17 @@ function extract()
if [[ $PLATFORM == CYGWIN* ]]; then if [[ $PLATFORM == CYGWIN* ]]; then
# Work around Cygwin brokenness. function create_symlink()
function ln()
{ {
[[ $1 == -* ]] && rm -f $3 cp -f $1 $2
$(which ln) $@ }
else
function create_symlink()
{
ln -sf $1 $2
} }
export -f ln
fi fi

20
wrapper/build.sh
View File

@ -16,7 +16,11 @@ if [ -z "$OSXCROSS_VERSION" ]; then
fi fi
set -e set -e
EXESUFFIX="" if [[ $PLATFORM == CYGWIN* ]]; then
EXESUFFIX=".exe"
else
EXESUFFIX=""
fi
function create_wrapper_link function create_wrapper_link
{ {
@ -36,31 +40,31 @@ function create_wrapper_link
# -> x86_64h-apple-darwinXX-osxcross # -> x86_64h-apple-darwinXX-osxcross
if [ $# -ge 2 ] && [ $2 -eq 1 ]; then if [ $# -ge 2 ] && [ $2 -eq 1 ]; then
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"${1}${EXESUFFIX}" "${1}${EXESUFFIX}"
fi fi
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"i386-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}" "i386-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}"
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"x86_64-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}" "x86_64-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}"
if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] && if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] &&
([[ $1 != gcc* ]] && [[ $1 != g++* ]] && [[ $1 != *gstdc++ ]]); then ([[ $1 != gcc* ]] && [[ $1 != g++* ]] && [[ $1 != *gstdc++ ]]); then
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"x86_64h-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}" "x86_64h-apple-${OSXCROSS_TARGET}-${1}${EXESUFFIX}"
fi fi
if [ $# -ge 2 ] && [ $2 -eq 2 ]; then if [ $# -ge 2 ] && [ $2 -eq 2 ]; then
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"o32-${1}${EXESUFFIX}" "o32-${1}${EXESUFFIX}"
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"o64-${1}${EXESUFFIX}" "o64-${1}${EXESUFFIX}"
if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] && if [ -n "$X86_64H_SUPPORTED" ] && [ $X86_64H_SUPPORTED -eq 1 ] &&
([[ $1 != gcc* ]] && [[ $1 != g++* ]] && [[ $1 != *gstdc++ ]]); then ([[ $1 != gcc* ]] && [[ $1 != g++* ]] && [[ $1 != *gstdc++ ]]); then
verbose_cmd ln -sf "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \ verbose_cmd create_symlink "${TARGETTRIPLE}-wrapper${EXESUFFIX}" \
"o64h-${1}${EXESUFFIX}" "o64h-${1}${EXESUFFIX}"
fi fi
fi fi