From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 73AB259CAF for ; Sun, 10 Apr 2016 06:23:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 556FF21C010; Sun, 10 Apr 2016 06:23:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0034921C010 for ; Sun, 10 Apr 2016 06:23:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92338340B3A for ; Sun, 10 Apr 2016 06:23:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A653DC8 for ; Sun, 10 Apr 2016 06:23:24 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1460269351.d02bb93e507c03f813d136e6f20267d3187c3fd4.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d02bb93e507c03f813d136e6f20267d3187c3fd4 X-VCS-Branch: master Date: Sun, 10 Apr 2016 06:23:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9b1bbe7-3f3f-42f4-a357-2461b9ab0b2c X-Archives-Hash: 8a1707d81b347cff72ca6da10b8bb368 commit: d02bb93e507c03f813d136e6f20267d3187c3fd4 Author: Fabian Groffen gentoo org> AuthorDate: Sun Apr 10 06:22:31 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Apr 10 06:22:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d02bb93e prepare: ensure xcode-select is set to CommandLineTools this is needed during the bootstrap, to be able to build llvm scripts/bootstrap-prefix.sh | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index e8042fe..bce5ab8 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1683,18 +1683,32 @@ EOF echo "Great! You appear to have a compiler in your PATH" fi - if type -P xcode-select > /dev/null && [[ ! -d /usr/include ]] ; then - # bug #512032 - cat << EOF + if type -P xcode-select > /dev/null ; then + if [[ ! -d /usr/include ]] ; then + # bug #512032 + cat << EOF You don't have /usr/include, this thwarts me to build stuff. Please execute: xcode-select --install or install /usr/include in another way and try running me again. EOF - exit 1 - fi + exit 1 + fi + if [[ $(xcode-select -p) != */CommandLineTools ]] ; then + # to an extent, bug #564814 and bug #562800 + cat << EOF +Your xcode-select is not set to CommandLineTools. This prevents builds +from succeeding. Switch to command line tools for the bootstrap to +continue. Please execute: + xcode-select -s /Library/Developer/CommandLineTools +and try running me again. +EOF + exit 1 + fi + fi + echo local ncpu= case "${CHOST}" in