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

fix relocation issues

Browse Source
This commit is contained in:
Thomas Pöchtrager 2015-08-21 23:32:37 +02:00
parent 31a9707629
commit 03e904d5f1
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.sh
View File

@ -202,9 +202,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 ../../tools/osxcross-macports osxcross-macports ln -sf $BASE_DIR/tools/osxcross-macports osxcross-macports
ln -sf ../../tools/osxcross-macports osxcross-mp ln -sf $BASE_DIR/tools/osxcross-macports osxcross-mp
ln -sf ../../tools/osxcross-macports omp ln -sf $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*)
@ -308,6 +308,7 @@ 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
export OSXCROSS_LINKER_VERSION=$LINKER_VERSION export OSXCROSS_LINKER_VERSION=$LINKER_VERSION
export OSXCROSS_BUILD_DIR=$BUILD_DIR
if [ "$PLATFORM" != "Darwin" ]; then if [ "$PLATFORM" != "Darwin" ]; then
# libLTO.so # libLTO.so

1
wrapper/Makefile
View File

@ -22,6 +22,7 @@ override CXXFLAGS+=-DOSXCROSS_TARGET="\"$(OSXCROSS_TARGET)\""
override CXXFLAGS+=-DOSXCROSS_OSX_VERSION_MIN="\"$(OSXCROSS_OSX_VERSION_MIN)\"" override CXXFLAGS+=-DOSXCROSS_OSX_VERSION_MIN="\"$(OSXCROSS_OSX_VERSION_MIN)\""
override CXXFLAGS+=-DOSXCROSS_LINKER_VERSION="\"$(OSXCROSS_LINKER_VERSION)\"" override CXXFLAGS+=-DOSXCROSS_LINKER_VERSION="\"$(OSXCROSS_LINKER_VERSION)\""
override CXXFLAGS+=-DOSXCROSS_LIBLTO_PATH="\"$(OSXCROSS_LIBLTO_PATH)\"" override CXXFLAGS+=-DOSXCROSS_LIBLTO_PATH="\"$(OSXCROSS_LIBLTO_PATH)\""
override CXXFLAGS+=-DOSXCROSS_BUILD_DIR="\"$(OSXCROSS_BUILD_DIR)\""
override CXXFLAGS+= $(OSXCROSS_CXXFLAGS) override CXXFLAGS+= $(OSXCROSS_CXXFLAGS)

2
wrapper/build.sh
View File

@ -127,7 +127,7 @@ if [ -n "$BWCOMPILEONLY" ]; then
exit 0 exit 0
fi fi
verbose_cmd mv wrapper "../target/bin/${TARGETTRIPLE}-wrapper${EXESUFFIX}" verbose_cmd mv wrapper "${TARGET_DIR}/bin/${TARGETTRIPLE}-wrapper${EXESUFFIX}"
pushd "../target/bin" &>/dev/null pushd "../target/bin" &>/dev/null

13
wrapper/programs/osxcross-conf.cpp
View File

@ -31,6 +31,7 @@ int conf(Target &target) {
std::string SDKPath; std::string SDKPath;
OSVersion OSXVersionMin = getDefaultMinTarget(); OSVersion OSXVersionMin = getDefaultMinTarget();
const char *ltopath = getLibLTOPath(); const char *ltopath = getLibLTOPath();
const char *builddir = getBuildDir();
if (!target.getSDKPath(SDKPath)) if (!target.getSDKPath(SDKPath))
return 1; return 1;
@ -59,8 +60,16 @@ int conf(Target &target) {
<< std::endl; << std::endl;
std::cout << "export OSXCROSS_TARGET_DIR=" << target.execpath << "/.." std::cout << "export OSXCROSS_TARGET_DIR=" << target.execpath << "/.."
<< std::endl; << std::endl;
std::cout << "export OSXCROSS_BUILD_DIR=" << target.execpath << "/../../build"
<< std::endl; std::cout << "export OSXCROSS_BUILD_DIR=";
if (builddir[0])
std::cout << builddir;
else
std::cout << target.execpath << "/../../build";
std::cout << std::endl;
std::cout << "export OSXCROSS_CCTOOLS_PATH=" << target.execpath std::cout << "export OSXCROSS_CCTOOLS_PATH=" << target.execpath
<< std::endl; << std::endl;
std::cout << "export OSXCROSS_LIBLTO_PATH=" << ltopath std::cout << "export OSXCROSS_LIBLTO_PATH=" << ltopath

1
wrapper/target.h
View File

@ -32,6 +32,7 @@ constexpr const char *getDefaultTarget() { return OSXCROSS_TARGET; }
constexpr const char *getDefaultCompiler() { return "clang"; } constexpr const char *getDefaultCompiler() { return "clang"; }
constexpr const char *getDefaultCXXCompiler() { return "clang++"; } constexpr const char *getDefaultCXXCompiler() { return "clang++"; }
constexpr const char *getLinkerVersion() { return OSXCROSS_LINKER_VERSION; } constexpr const char *getLinkerVersion() { return OSXCROSS_LINKER_VERSION; }
constexpr const char *getBuildDir() { return OSXCROSS_BUILD_DIR; }
constexpr const char *getLibLTOPath() { constexpr const char *getLibLTOPath() {
#ifdef OSXCROSS_LIBLTO_PATH #ifdef OSXCROSS_LIBLTO_PATH