Commit 286aa019 authored by Filip Roséen's avatar Filip Roséen Committed by 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's avatarMarvin Scholz <epirat07@gmail.com>
parent 07811f4b
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment