commit 2e957af35c98aea410883eb28092176b3c3aa939 Author: Thomas Pöchtrager Date: Sun Nov 10 14:49:24 2013 +0100 initial commit diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..9e0b0d4 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Thomas Poechtrager (t.poechtrager@gmail.com) diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..5510e64 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,13 @@ +0.3: +- added: SDK download links to README +- added: support 10.9 (Mavericks) SDK +- added: *-apple-darwin*-clang* symlinks (same as invoking o32-clang or o64-clang++) +- changed: no need to build extra cctools binaries for targeting i386, symlinking the x86_64 builds works as well + +0.2: +- changed: update cctools to 839 with ld64-134.9 +- added: check for broken unistd.h +- fixed: check if MacOSX package is present in tarballs +- added: comments in build.sh + +0.1: - diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..88dfd95 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README new file mode 100644 index 0000000..b69bad9 --- /dev/null +++ b/README @@ -0,0 +1,38 @@ +- Oclang: OS X cross toolchain for linux - + +Oclang is a tool which helps you to cross compile source code easily with clang on linux for OS X. + +After the installation you will have "o32-clang", "o32-clang++", "o64-clang" and "o64-clang++" available as compiler. + +Make sure you have the following installed on your linux-system: + + Clang 3.2+, llvm-devel, automake, autogen, libtool, + libxml2-devel, libuuid-devel, openssl-devel and the bash shell + +Then edit TARGET and so on in build.sh, so it fits your requirements. + +Then run + +./build.sh + +to build the OS X cross toolchain (it will guide you through the installation). + + +SDK Download: + + * Links: + + * Installation: + -> Download the SDK to the tarballs/ directory and do not forget to adjust + -> the SDK_VERSION in build.sh! + + +LICENSE: + bash scripts: GPLv2 + cctools: APSL 2.0 + xar: New BSD + + +CREDITS: + cjacker for the CCTOOLS linux port, checkout his ios-toolchain-based-on-clang-for-linux project: + https://code.google.com/p/ios-toolchain-based-on-clang-for-linux diff --git a/TODO b/TODO new file mode 100644 index 0000000..1003b95 --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +report the __block issue in unistd.h to the maintainers diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..24f5532 --- /dev/null +++ b/build.sh @@ -0,0 +1,261 @@ +#!/usr/bin/env bash + +export LC_ALL="C" +export CC=clang +export CXX=clang++ + +# How many concurrent jobs should be used for compiling? +JOBS=`grep -c ^processor /proc/cpuinfo` + +# SDK version to use (don't forget to change TARGET too) +SDK_VERSION=10.8 + +# Minimum targeted OS X version +# Must be <= SDK_VERSION +# You can comment this variable out, +# if you want to use clangs default value +OSX_VERSION_MIN=10.5 + +# ld version +LINKER_VERSION=134.9 + +# Don't change this +OCLANG_VERSION=0.3 + +function require +{ + which $1 &>/dev/null + while [ $? -ne 0 ] + do + echo "" + read -p "Install $1 then press enter" + which $1 &>/dev/null + done +} + +BASE_DIR=`pwd` +TARBALL_DIR=$BASE_DIR/tarballs +BUILD_DIR=$BASE_DIR/build +TARGET_DIR=$BASE_DIR/target +PATCH_DIR=$BASE_DIR/patches +SDK_DIR=$TARGET_DIR/SDK + +JOBSSTR="jobs" +if [ $JOBS -eq 1 ]; then + JOBSSTR="job" +fi + +if [ "$OSX_VERSION_MIN" == "" ]; then + OSX_VERSION_MIN="default" +fi + +case $SDK_VERSION in + 10.4*) TARGET=darwin8 ;; + 10.5*) TARGET=darwin9 ;; + 10.6*) TARGET=darwin10 ;; + 10.7*) TARGET=darwin11 ;; + 10.8*) TARGET=darwin12 ;; + 10.9*) TARGET=darwin13 ;; + *) echo "Invalid SDK Version"; exit 1 ;; +esac + +echo "" +echo "Building oclang, Version: $OCLANG_VERSION" +echo "" +echo "OS X SDK Version: $SDK_VERSION, Target: $TARGET" +echo "Minimum targeted OS X Version: $OSX_VERSION_MIN" +echo "Tarball Directory: $TARBALL_DIR" +echo "Build Directory: $BUILD_DIR" +echo "Install Directory: $TARGET_DIR" +echo "SDK Install Directory: $SDK_DIR" +echo "Compile with $JOBS concurrent $JOBSSTR" +echo "" +read -p "Press enter to start building" +echo "" + +export PATH=$TARGET_DIR/bin:$PATH + +mkdir -p $BUILD_DIR || exit 1 +mkdir -p $TARGET_DIR || exit 1 +mkdir -p $SDK_DIR || exit 1 + +require $CC +require $CXX +require clang +require make +require sed +require patch +require gunzip +require cpio +require autogen +require automake +require libtool + +CLANG_TARGET_OPTION=`./oclang/check_clang_target_option.sh` +test $? -eq 0 || exit 1 + +pushd $BUILD_DIR || exit 1 + +if [ ! -f "have_cctools_$TARGET" ]; then + +BLOCK_LINE=`grep -n "__block," /usr/include/unistd.h` +while [ $? -eq 0 ] +do + BLOCK_LINE_NUM=`echo "$BLOCK_LINE" | cut -d ':' -f 1` + BLOCK_LINE_BAD=`echo "$BLOCK_LINE" | cut -d ':' -f 2` + BLOCK_LINE_GOOD=`echo "$BLOCK_LINE_BAD" | sed 's/__block,/__libc_block,/g'` + echo "" + echo "Your /usr/include/unistd.h header file appears to be broken." + echo "Replace __block with __libc_block on line $BLOCK_LINE_NUM, otherwise compiling cctools will fail!" + echo "" + echo "Bad: $BLOCK_LINE_BAD" + echo "Good: $BLOCK_LINE_GOOD" + echo "" + read -p "Press enter to continue when you have fixed the header file" + BLOCK_LINE=`grep -n "__block," /usr/include/unistd.h` +done + +tar xzfv $TARBALL_DIR/cctools-*.tar.gz || exit 1 +tar xzfv $TARBALL_DIR/xar*.tar.gz || exit 1 + +pushd cctools* +patch -p0 < $PATCH_DIR/ld64-1.patch || exit 1 +patch -p0 < $PATCH_DIR/ld64-2.patch || exit 1 +patch -p0 < $PATCH_DIR/llvm-3.4.patch || exit 1 +./autogen.sh +./configure --prefix=$TARGET_DIR --target=x86_64-apple-$TARGET || exit 1 +make -j$JOBS || exit 1 +make install || exit 1 + +pushd $TARGET_DIR/bin +CCTOOLS=`find . -name "x86_64-apple-darwin*"` +CCTOOLS=($CCTOOLS) +for CCTOOL in ${CCTOOLS[@]}; do + CCTOOL_I386=`echo "$CCTOOL" | sed 's/x86_64/i386/g'` + ln -sf $CCTOOL $CCTOOL_I386 || exit 1 +done +popd + +popd + +pushd xar* +./configure --prefix=$TARGET_DIR || exit 1 +make -j$JOBS || exit +make install || exit 1 +popd + +function check +{ + [ -f "/$TARGET_DIR/bin/$1-apple-$TARGET-lipo" ] || exit 1 + [ -f "/$TARGET_DIR/bin/$1-apple-$TARGET-ld" ] || exit 1 + [ -f "/$TARGET_DIR/bin/$1-apple-$TARGET-nm" ] || exit 1 + [ -f "/$TARGET_DIR/bin/$1-apple-$TARGET-ar" ] || exit 1 + [ -f "/$TARGET_DIR/bin/$1-apple-$TARGET-ranlib" ] || exit 1 + [ -f "/$TARGET_DIR/bin/$1-apple-$TARGET-strip" ] || exit 1 +} + +check i386 +check x86_64 + +touch "have_cctools_$TARGET" + +fi # HAVE_CCTOOLS + +ls $TARBALL_DIR/MacOSX$SDK_VERSION* &>/dev/null +while [ $? -ne 0 ] +do + echo "" + echo "Get the MacOSX$SDK_VERSION SDK and move it into $TARBALL_DIR" + echo "(see README for SDK download links)" + echo "" + echo "You can press ctrl-c to break the build process," + echo "if you restart ./build.sh then we will continue from here" + echo "" + read -p "Press enter to continue" + ls $TARBALL_DIR/MacOSX$SDK_VERSION* &>/dev/null +done + +SDK=`ls $TARBALL_DIR/MacOSX$SDK_VERSION*` +SDK_FILENAME=`basename $SDK` + +echo "extracting $SDK_FILENAME ..." + +case $SDK in + *.pkg) + xar -xf $SDK || exit 1 + (cat Payload | gunzip -dc | cpio -i 2>/dev/null) || exit 1 + ;; + *.tar.xz) + tar xJf $SDK + ;; + *.tar.gz) + tar xzf $SDK + ;; +esac + +rm -rf $SDK_DIR/MacOSX$SDK_VERSION* 2>/dev/null +mv -f SDKs/*$SDK_VERSION* $SDK_DIR || exit 1 + +pushd $SDK_DIR/MacOSX$SDK_VERSION.sdk || exit 1 +ln -s $SDK_DIR/MacOSX$SDK_VERSION.sdk/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/std*.h usr/include 2>/dev/null +popd + +popd + +cp oclang/oclang $TARGET_DIR/bin || exit 1 + +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/o32-clang || exit 1 +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/o32-clang++ || exit 1 +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/o64-clang || exit 1 +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/o64-clang++ || exit 1 + +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/i386-apple-$TARGET-clang +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/i386-apple-$TARGET-clang++ +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/x86_64-apple-$TARGET-clang +ln -sf $TARGET_DIR/bin/oclang $TARGET_DIR/bin/x86_64-apple-$TARGET-clang++ + +rm $TARGET_DIR/bin/oclang-conf 2>/dev/null + +echo "#!/usr/bin/env bash" > $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_VERSION=$OCLANG_VERSION\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_OSX_VERSION_MIN=$OSX_VERSION_MIN\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_TARGET=$TARGET\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_SDK_VERSION=$SDK_VERSION\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_SDK=$SDK_DIR/MacOSX$SDK_VERSION.sdk\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_CCTOOLS_PATH=$TARGET_DIR/bin\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_TARGET_OPTION=$CLANG_TARGET_OPTION\"" >> $TARGET_DIR/bin/oclang-conf +echo "echo \"export OCLANG_LINKER_VERSION=$LINKER_VERSION\"" >> $TARGET_DIR/bin/oclang-conf +chmod +x $TARGET_DIR/bin/oclang-conf + +function test_compiler +{ + echo -ne "testing $1 ... " + ($1 $2 -O2 -Wall -o test && rm test) || exit 1 + echo "works" +} + +echo "" + +test_compiler o32-clang $BASE_DIR/oclang/test.c +test_compiler o64-clang $BASE_DIR/oclang/test.c + +test_compiler o32-clang++ $BASE_DIR/oclang/test.cpp +test_compiler o64-clang++ $BASE_DIR/oclang/test.cpp + +echo "" +echo "Now add" +echo "" +echo "export PATH=\$PATH:$TARGET_DIR/bin" +echo "" +echo "to your ~/.bashrc or ~/.profile" +echo "" + +echo "Done! Now you can use o32-clang(++) and o64-clang(++) like a normal compiler" +echo "" +echo "Example usage:" +echo "" +echo "Example 1: CC=o32-clang ./configure --host=i386-apple-$TARGET" +echo "Example 2: CC=i386-apple-$TARGET-clang ./configure --host=i386-apple-$TARGET" +echo "Example 3: o64-clang -Wall test.c -o test" +echo "Example 4: x86_64-apple-$TARGET-strip -x test" +echo "" diff --git a/cleanup.sh b/cleanup.sh new file mode 100755 index 0000000..aed06b4 --- /dev/null +++ b/cleanup.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +rm -f *~ +rm -rf build +rm -rf target +rm -f *.tar.xz diff --git a/oclang/check_clang_target_option.sh b/oclang/check_clang_target_option.sh new file mode 100755 index 0000000..ad77453 --- /dev/null +++ b/oclang/check_clang_target_option.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +export LC_ALL="C" + +which clang 2>&1 1>/dev/null || exit 1 + +x=`clang -target i386-apple-darwin9 2>&1` + +case "$x" in + *i386-apple-darwin9*) + echo "-ccc-host-triple" + exit 0 + ;; +esac + +echo "-target" diff --git a/oclang/oclang b/oclang/oclang new file mode 100755 index 0000000..8d73911 --- /dev/null +++ b/oclang/oclang @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +eval `oclang-conf` +type=`basename $0` + +if [ "$type" != "${type/o64/}" ] || [ "$type" != "${type/x86_64/}" ]; then + ARCH1="x86_64" + ARCH2=$ARCH1 +else + if [ "$type" != "${type/o32/}" ] || [ "$type" != "${type/i386/}" ]; then + ARCH1="i386" + ARCH2="i686" + else + echo "unknown arch" + exit 1 + fi +fi + +if [ "$type" != "${type/++/}" ]; then + COMPILER="clang++" +else + COMPILER="clang" +fi + +if [ "$OCLANG_OSX_VERSION_MIN" != "default" ]; then + OSX_VERSION_MIN_OPT="-mmacosx-version-min=$OCLANG_OSX_VERSION_MIN" +else + OSX_VERSION_MIN_OPT="" +fi + +export COMPILER_PATH="$OCLANG_CCTOOLS_PATH:${COMPILER_PATH}" + +STDINC=$OCLANG_SDK/usr/include +CPLUSINC1=$OCLANG_SDK/usr/lib/gcc/i686-apple-$OCLANG_TARGET/4.2.1/include +CPLUSINC2=$OCLANG_SDK/usr/include/c++/4.0.0 +CPLUSINC3=$OCLANG_SDK/usr/include/c++/4.0.0/$ARCH2-apple-darwin9 +TARGET=$ARCH1-apple-$OCLANG_TARGET + +$COMPILER $OCLANG_TARGET_OPTION $TARGET -isysroot $OCLANG_SDK \ +-isystem $STDINC -isystem $CPLUSINC1 -isystem $CPLUSINC2 -isystem $CPLUSINC3 \ +$OSX_VERSION_MIN_OPT -mlinker-version=$OCLANG_LINKER_VERSION $OCLANG_OPT_ARGS \ +${1+"$@"} + +exit $? diff --git a/oclang/test.c b/oclang/test.c new file mode 100644 index 0000000..3698403 --- /dev/null +++ b/oclang/test.c @@ -0,0 +1,7 @@ +#include + +int main() +{ + printf("works"); + return 0; +} diff --git a/oclang/test.cpp b/oclang/test.cpp new file mode 100644 index 0000000..0f4e68e --- /dev/null +++ b/oclang/test.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + std::cout << "works" << std::endl; + return 0; +} diff --git a/package.sh b/package.sh new file mode 100755 index 0000000..6289117 --- /dev/null +++ b/package.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +TMPDIR=`mktemp -d` +test $? -eq 0 || exit 1 +BASEDIR=`pwd` +cp -r . $TMPDIR +pushd $TMPDIR || exit 1 +rm -rf build +rm -rf target +rm -rf tarballs/*MacOSX* +find . -name "*~" -exec rm {} \; +find . -name "*.save" -exec rm {} \; +rm -rf *.tar.xz +tar -cf - * | xz -9 -c - > $BASEDIR/oclang.tar.xz || exit 1 +popd +rm -rf $TMPDIR diff --git a/patches/ld64-1.patch b/patches/ld64-1.patch new file mode 100644 index 0000000..f1dd2bf --- /dev/null +++ b/patches/ld64-1.patch @@ -0,0 +1,22 @@ +--- ld64/src/3rd/helper_backup.h 2013-02-24 11:26:01.159718369 -0800 ++++ ld64/src/3rd/helper.h 2013-02-24 11:27:22.107716807 -0800 +@@ -1,6 +1,10 @@ + #ifndef _HELPER_H + #define _HELPER_H + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #include + #include + #include +@@ -30,4 +34,8 @@ + + uint64_t mach_absolute_time(void); + ++#ifdef __cplusplus ++} ++#endif ++ + #endif diff --git a/patches/ld64-2.patch b/patches/ld64-2.patch new file mode 100644 index 0000000..56c473d --- /dev/null +++ b/patches/ld64-2.patch @@ -0,0 +1,11 @@ +--- ld64/src/ld/Snapshot.cpp 2013-10-02 20:08:31.672088145 +0200 ++++ ld64/src/ld/Snapshot.cpp 2013-10-02 20:08:42.330088934 +0200 +@@ -15,7 +15,7 @@ + #include + #include + #include +-#include ++#include + + #include "Snapshot.h" + #include "Options.h" diff --git a/patches/llvm-3.4.patch b/patches/llvm-3.4.patch new file mode 100644 index 0000000..fa7bea1 --- /dev/null +++ b/patches/llvm-3.4.patch @@ -0,0 +1,21 @@ +--- configure.ac 2013-09-23 14:13:38.000000000 +0200 ++++ configure.ac 2013-10-23 21:30:12.000000000 +0200 +@@ -205,13 +205,13 @@ + AC_CHECK_PROG(HAVE_LLVM_CONFIG, llvm-config, true, false) + + if test "x$HAVE_LLVM_CONFIG" = "xfalse"; then +- AC_CHECK_PROG(HAVE_LLVM_CONFIG_32, llvm-config-3.2, true, false) +- if test "x$HAVE_LLVM_CONFIG_32" = "xfalse"; then +- AC_MSG_ERROR([llvm-config or llvm-config-3.2 not found on your system,please install related packages]) ++ AC_CHECK_PROG(HAVE_LLVM_CONFIG_34, llvm-config-3.4, true, false) ++ if test "x$HAVE_LLVM_CONFIG_34" = "xfalse"; then ++ AC_MSG_ERROR([llvm-config or llvm-config-3.4 not found on your system,please install related packages]) + else +- LLVM_LIBDIR=`llvm-config-3.2 --libdir` ++ LLVM_LIBDIR=`llvm-config-3.4 --libdir` + if test -f $LLVM_LIBDIR/libLTO.so;then +- LTO_LIBS="-L`llvm-config-3.2 --libdir` -lLTO" ++ LTO_LIBS="-L`llvm-config-3.4 --libdir` -lLTO" + LTO_DEFS="-DLTO_SUPPORT=1" + fi + fi diff --git a/patches/xar-configure.patch b/patches/xar-configure.patch new file mode 100644 index 0000000..9f3801c --- /dev/null +++ b/patches/xar-configure.patch @@ -0,0 +1,20 @@ +--- configure 2013-10-02 19:22:22.125610322 +0200 ++++ configure 2013-10-02 19:23:08.833608564 +0200 +@@ -7742,7 +7742,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcrypto $LIBS" ++LIBS="-lcrypto -ldl $LIBS -lm" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7805,7 +7805,7 @@ + #define HAVE_LIBCRYPTO 1 + _ACEOF + +- LIBS="-lcrypto $LIBS" ++ LIBS="-lcrypto -ldl $LIBS -lm" + + else + have_libcrypto="0" diff --git a/tarballs/cctools-839-ld64-134.9-1.3.tar.gz b/tarballs/cctools-839-ld64-134.9-1.3.tar.gz new file mode 100644 index 0000000..434d565 Binary files /dev/null and b/tarballs/cctools-839-ld64-134.9-1.3.tar.gz differ diff --git a/tarballs/xar-1.5.2.tar.gz b/tarballs/xar-1.5.2.tar.gz new file mode 100644 index 0000000..419d57a Binary files /dev/null and b/tarballs/xar-1.5.2.tar.gz differ