Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-03-09 07:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use TARGET_DIR instead of hardcoding ../target

Browse Source 
To make the build work when TARGET_DIR has been changed in tools.sh.
This commit is contained in:
Erik Johansson 2019-10-23 10:56:08 +02:00
parent 0713de13d6
commit cf5aa6c5f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wrapper/build.sh
View File

@ -7,7 +7,7 @@ popd &>/dev/null
set +e set +e
if [ -z "$OSXCROSS_VERSION" ]; then if [ -z "$OSXCROSS_VERSION" ]; then
eval $(../target/bin/osxcross-conf 2>/dev/null) eval $(${TARGET_DIR}/bin/osxcross-conf 2>/dev/null)
if [ -n "$OSXCROSS_SDK_VERSION" ]; then if [ -n "$OSXCROSS_SDK_VERSION" ]; then
if [ -z "$X86_64H_SUPPORTED" ]; then if [ -z "$X86_64H_SUPPORTED" ]; then
@ -127,7 +127,7 @@ fi
function compile_wrapper() function compile_wrapper()
{ {
mkdir -p ../target ../target/bin mkdir -p ${TARGET_DIR}/bin
export PLATFORM export PLATFORM
export CXX export CXX
@ -145,7 +145,7 @@ fi
verbose_cmd mv wrapper "${TARGET_DIR}/bin/${TARGETTRIPLE}-wrapper" verbose_cmd mv wrapper "${TARGET_DIR}/bin/${TARGETTRIPLE}-wrapper"
pushd "../target/bin" &>/dev/null pushd "${TARGET_DIR}/bin" &>/dev/null
if [ $TARGETCOMPILER = "clang" ]; then if [ $TARGETCOMPILER = "clang" ]; then
create_wrapper_link clang 2 create_wrapper_link clang 2