[vlc-commits] extra/tools: use gcc-4.2 on Darwin

Rafaël Carré git at videolan.org
Wed Nov 30 01:21:19 CET 2011


vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Nov 29 12:20:55 2011 -0500| [6da05158f3ef5bf47b1eb33b8c9853fea29a9f61] | committer: Jean-Baptiste Kempf

extra/tools: use gcc-4.2 on Darwin
(cherry picked from commit c7de7efc6275629903d63e96a05a2cc6de239484)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=6da05158f3ef5bf47b1eb33b8c9853fea29a9f61
---

 extras/tools/bootstrap |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 1cea282..b7d48e6 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -65,12 +65,16 @@ check_tar
 [ -n "$NEEDED" ] && mkdir -p build/
 
 CPUS=
+CC=
+CXX=
 case `uname` in
     Linux)
         CPUS=`grep -c ^processor /proc/cpuinfo`
      ;;
     Darwin)
         CPUS=`sysctl hw.ncpu|cut -d: -f2`
+        gcc-4.2 --version >/dev/null 2>&1 && CC=CC=gcc-4.2
+        g++-4.2 --version >/dev/null 2>&1 && CXX=CXX=g++-4.2
     ;;
     *)
         CPUS=1  # default
@@ -80,6 +84,8 @@ esac
 
 cat > Makefile << EOF
 MAKEFLAGS += -j$CPUS
+$CC
+$CXX
 PREFIX=\$(abspath ./build)
 
 all: $NEEDED



More information about the vlc-commits mailing list