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

osxcross-env is also no longer needed

Browse Source
This commit is contained in:
Thomas Pöchtrager 2015-02-24 21:19:27 +01:00
parent 86b2ab7052
commit 133a61d75a
3 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -45,8 +45,7 @@ But be careful, that repository is known to cause [troubles](https://github.com/
Then run `./build.sh` to build the cross toolchain. Then run `./build.sh` to build the cross toolchain.
(It will search 'tarballs' for your SDK and then build in its own directory.) (It will search 'tarballs' for your SDK and then build in its own directory.)
**Don't forget** to add the printed `` `<path>/osxcross-env` `` to your `~/.profile` or `~/.bashrc`. **Do not forget** to add the `<path>/target/bin` to your PATH variable.
Then either run `source ~/.profile` or restart your shell session.
That's it. See usage examples below. That's it. See usage examples below.

28
build.sh
View File

@ -352,35 +352,15 @@ if [ `osxcross-cmp ${SDK_VERSION/u/} ">=" 10.7` -eq 1 ]; then
test_compiler_cxx11 o64-clang++ $BASE_DIR/oclang/test_libcxx.cpp test_compiler_cxx11 o64-clang++ $BASE_DIR/oclang/test_libcxx.cpp
fi fi
set +e
HAVE_CSH=0
which csh &>/dev/null
[ $? -eq 0 ] && HAVE_CSH=1
if [ $HAVE_CSH -eq 0 ]; then
which tcsh &>/dev/null
[ $? -eq 0 ] && HAVE_CSH=1
fi
CSHRC=""
[ $HAVE_CSH -eq 1 ] && CSHRC=", ~/.cshrc"
set -e
echo "" echo ""
echo "Now add" echo "Do not forget to add"
echo "" echo ""
echo -e "\x1B[32m\`$OSXCROSS_ENV\`\x1B[0m" echo -e "\x1B[32m${TARGET_DIR}/bin\x1B[0m"
echo "" echo ""
if [ $HAVE_CSH -eq 1 ]; then echo "to your PATH variable."
echo "or in case of csh:"
echo ""
echo -e "\x1B[32msetenv PATH \`$OSXCROSS_ENV -v=PATH\`\x1B[0m"
echo ""
fi
echo "to your ~/.bashrc${CSHRC} or ~/.profile (including the '\`')"
echo "" echo ""
echo "Done! Now you can use o32-clang(++) and o64-clang(++) like a normal compiler" echo "All done! Now you can use o32-clang(++) and o64-clang(++) like a normal compiler."
echo "" echo ""
echo "Example usage:" echo "Example usage:"
echo "" echo ""

8
patches/cctools-ld64-rpath.patch
View File

@ -1,15 +1,14 @@
--- configure --- configure
+++ configure +++ configure
@@ -16789,7 +16789,7 @@ @@ -16789,7 +16789,6 @@
LTO_LIB="-L${LLVM_LIB_DIR} -lLTO" LTO_LIB="-L${LLVM_LIB_DIR} -lLTO"
if test "x$rpathlink" = "xyes"; then if test "x$rpathlink" = "xyes"; then
LTO_RPATH="-Wl,-rpath,$LLVM_LIB_DIR,--enable-new-dtags" LTO_RPATH="-Wl,-rpath,$LLVM_LIB_DIR,--enable-new-dtags"
- LTO_LIB="$LTO_RPATH $LTO_LIB" - LTO_LIB="$LTO_RPATH $LTO_LIB"
+ LTO_LIB="$LTO_LIB"
fi fi
LTO_DEF=-DLTO_SUPPORT LTO_DEF=-DLTO_SUPPORT
# DO NOT include the LLVM include dir directly, # DO NOT include the LLVM include dir directly,
@@ -16813,6 +16813,8 @@ @@ -16813,6 +16812,8 @@
@ -20,12 +19,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
--- m4/llvm.m4 --- m4/llvm.m4
+++ m4/llvm.m4 +++ m4/llvm.m4
@@ -27,7 +27,7 @@ @@ -27,7 +27,6 @@
[ LTO_LIB="-L${LLVM_LIB_DIR} -lLTO" [ LTO_LIB="-L${LLVM_LIB_DIR} -lLTO"
if test "x$rpathlink" = "xyes"; then if test "x$rpathlink" = "xyes"; then
LTO_RPATH="-Wl,-rpath,$LLVM_LIB_DIR,--enable-new-dtags" LTO_RPATH="-Wl,-rpath,$LLVM_LIB_DIR,--enable-new-dtags"
- LTO_LIB="$LTO_RPATH $LTO_LIB" - LTO_LIB="$LTO_RPATH $LTO_LIB"
+ LTO_LIB="$LTO_LIB"
fi fi
LTO_DEF=-DLTO_SUPPORT LTO_DEF=-DLTO_SUPPORT
# DO NOT include the LLVM include dir directly, # DO NOT include the LLVM include dir directly,