Author: gcasa
Date: Thu Apr 28 20:43:53 2016
New Revision: 39705
URL: http://svn.gna.org/viewcvs/gnustep?rev=39705&view=rev
Log:
Add clang setup and update compile-all to eliminate circular dependency.
Added:
tools/scripts/trunk/clang-setup (with props)
Modified:
tools/scripts/trunk/compile-all
Added: tools/scripts/trunk/clang-setup
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/clang-setup?rev=39705&view=auto
==============================================================================
--- tools/scripts/trunk/clang-setup (added)
+++ tools/scripts/trunk/clang-setup Thu Apr 28 20:43:53 2016
@@ -0,0 +1,30 @@
+#!/bin/sh
+cd ~
+
+# cleanup
+rm -rf libdispatch
+rm -rf libobjc2
+
+# pull
+git clone https://github.com/gnustep/libobjc2.git
+git clone https://github.com/nickhutchinson/libdispatch.git
+
+# set vars
+export CC=clang
+export CXX=clang++
+
+# build and install
+cd libdispatch
+rm -rf libdispatch-build
+mkdir libdispatch-build && cd libdispatch-build
+../configure
+sudo make install
+sudo ldconfig
+
+cd ~/libobjc2
+mkdir libobjc2-build && cd libobjc2-build
+cmake ../
+sudo cmake --build . --target install
+sudo ldconfig
+
+
Propchange: tools/scripts/trunk/clang-setup
------------------------------------------------------------------------------
svn:executable = *
Modified: tools/scripts/trunk/compile-all
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/compile-all?rev=39705&r1=39704&r2=39705&view=diff
==============================================================================
--- tools/scripts/trunk/compile-all (original)
+++ tools/scripts/trunk/compile-all Thu Apr 28 20:43:53 2016
@@ -56,7 +56,7 @@
then
export MAKE=gmake
else
- export MAKE=make -j9
+ export MAKE=make
fi
if [ "$3" == "" ]; then
@@ -86,6 +86,14 @@
fi
fi
+# Install libobjc2, if needed...
+if [ "$CC" == "clang" ] ; then
+ ./scripts/clang-setup
+
+ # Assume the presence of libdispatch if we are using clang and libobjc2
+ export LDFLAGS=-ldispatch
+fi
+
# Install make
cd make
echo "===="
@@ -100,38 +108,6 @@
fi
. $prefix/System/Library/Makefiles/GNUstep.sh
-
-# Install libobjc2, if needed...
-if [ "$CC" == "clang" ] ; then
- makedir=`pwd`
-
- # Build and install libobjc2...
- cd ../../dev-libs/libobjc2
- # Get environment...
- . $prefix/System/Library/Makefiles/GNUstep.sh
- CCFLAGS=$cc_flags CXX=$CXX CC=$CC $MAKE clean
- CCFLAGS=$cc_flags CXX=$CXX CC=$CC $MAKE
- export OBJCFLAGS=-fobjc-runtime=gnustep-1.7
- if [ "true" == "$NEEDSROOT" ]; then
- sudo -u root $scriptsdir/install.sh $prefix $MAKE LOCAL
- else
- $MAKE GNUSTEP_INSTALLATION_DOMAIN=LOCAL install
- fi
- cd $makedir
-
- # Reconfigure make to use the new libobjc2 if it has been updated...
- CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure --prefix=$prefix
--with-layout=gnustep $make_flags
- if [ "true" == "$NEEDSROOT" ]; then
- sudo -u root $MAKE install
- else
- $MAKE messages=yes install
- fi
- # Refresh environment...
- . $prefix/System/Library/Makefiles/GNUstep.sh
-
- # Assume the presence of libdispatch if we are using clang and libobjc2
- export LDFLAGS=-ldispatch
-fi
# Install base
cd ../base
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
