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

Merge pull request #201 from erijo/target-dir

Browse Source 
Use TARGET_DIR instead of hardcoding ../target
This commit is contained in:
Thomas Pöchtrager 2019-10-23 13:08:32 +02:00 committed by GitHub
commit 9790e10a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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