From cf5aa6c5f1f9c373af7a77ef4ae7b58bf2d4b075 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Wed, 23 Oct 2019 10:56:08 +0200 Subject: [PATCH] Use TARGET_DIR instead of hardcoding ../target To make the build work when TARGET_DIR has been changed in tools.sh. --- wrapper/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wrapper/build.sh b/wrapper/build.sh index 80c30d2..a320aa2 100755 --- a/wrapper/build.sh +++ b/wrapper/build.sh @@ -7,7 +7,7 @@ popd &>/dev/null set +e 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 [ -z "$X86_64H_SUPPORTED" ]; then @@ -127,7 +127,7 @@ fi function compile_wrapper() { - mkdir -p ../target ../target/bin + mkdir -p ${TARGET_DIR}/bin export PLATFORM export CXX @@ -145,7 +145,7 @@ fi verbose_cmd mv wrapper "${TARGET_DIR}/bin/${TARGETTRIPLE}-wrapper" -pushd "../target/bin" &>/dev/null +pushd "${TARGET_DIR}/bin" &>/dev/null if [ $TARGETCOMPILER = "clang" ]; then create_wrapper_link clang 2