Author: gcasa
Date: Tue May 3 05:17:33 2016
New Revision: 39711
URL: http://svn.gna.org/viewcvs/gnustep?rev=39711&view=rev
Log:
Update compiler script
Modified:
tools/scripts/trunk/clang-setup
tools/scripts/trunk/compile-all
Modified: tools/scripts/trunk/clang-setup
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/clang-setup?rev=39711&r1=39710&r2=39711&view=diff
==============================================================================
--- tools/scripts/trunk/clang-setup (original)
+++ tools/scripts/trunk/clang-setup Tue May 3 05:17:33 2016
@@ -1,5 +1,9 @@
#!/bin/sh
cd ~
+
+# pre-create some directories
+#sudo mkdir -p /usr/GNUstep/Local/Library/Libraries
+#sudo mkdir -p /usr/GNUstep/Local/Library/Headers
# cleanup
rm -rf libdispatch
Modified: tools/scripts/trunk/compile-all
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/compile-all?rev=39711&r1=39710&r2=39711&view=diff
==============================================================================
--- tools/scripts/trunk/compile-all (original)
+++ tools/scripts/trunk/compile-all Tue May 3 05:17:33 2016
@@ -71,6 +71,14 @@
export CXX=$cxxcompiler
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
+
echo "==== compile-all"
echo "Using compiler $CC"
echo "Using c++ compiler $CXX"
@@ -86,14 +94,6 @@
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 "===="
@@ -102,9 +102,26 @@
CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure --prefix=$prefix
--with-layout=gnustep $make_flags
$MAKE
if [ "true" == "$NEEDSROOT" ]; then
-sudo -u root $MAKE install
+ sudo -u root $MAKE install
else
-$MAKE messages=yes install
+ $MAKE messages=yes install
+fi
+
+. $prefix/System/Library/Makefiles/GNUstep.sh
+
+if [ "$CC" == "clang" ] ; then
+ ${scriptsdir}/clang-setup
+
+ # Assume the presence of libdispatch if we are using clang and libobjc2
+ export LDFLAGS=-ldispatch
+
+ CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure --prefix=$prefix
--with-layout=gnustep $make_flags
+ $MAKE
+ if [ "true" == "$NEEDSROOT" ]; then
+ sudo -u root $MAKE install
+ else
+ $MAKE messages=yes install
+ fi
fi
. $prefix/System/Library/Makefiles/GNUstep.sh
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
