[vlc-commits] tools: bootstrap: do not override CC/CXX with gcc-4.2 on Darwin

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Wed Nov  9 01:30:10 2016 +0100| [286aa019464fe6927709af88adb48cf562971c70] | committer: Marvin Scholz

tools: bootstrap: do not override CC/CXX with gcc-4.2 on Darwin

The removed lines probably made some sense back in the days, but at
the current time things will fail to build in a horrible manner if
{gcc,g++}-4.2 is selected for CC and CXX (respectivelly).

Fixes #17614

Signed-off-by: Marvin Scholz <epirat07 at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=286aa019464fe6927709af88adb48cf562971c70
---

 extras/tools/bootstrap | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 9666436..94a1b57 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -87,16 +87,12 @@ check xz
 [ -n "$NEEDED" ] && mkdir -p build/ && echo "To-be-built packages: `echo $NEEDED | sed 's/\.//g'`"
 
 CPUS=
-CC=
-CXX=
 case `uname` in
     Linux|MINGW32*|MINGW64*)
         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
     ;;
     SunOS)
         CPUS=`/usr/bin/kstat -p :::state | grep 'on-line$' | wc -l | sed 's/ //g'`
@@ -110,8 +106,6 @@ esac
 cat > Makefile << EOF
 MAKEFLAGS += -j$CPUS
 CMAKEFLAGS += --parallel=$CPUS
-$CC
-$CXX
 PREFIX=\$(abspath ./build)
 
 all: $NEEDED