From patchwork Tue Jul 21 08:40:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lawrence D'Anna X-Patchwork-Id: 498054 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7122D140D31 for ; Tue, 21 Jul 2015 18:42:16 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6F5442843BC; Tue, 21 Jul 2015 10:41:04 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 69539284330 for ; Tue, 21 Jul 2015 10:41:02 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .elder-gods. - helo: .mail-pa0-f48.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 21 Jul 2015 10:40:58 +0200 (CEST) Received: by pacan13 with SMTP id an13so116855050pac.1 for ; Tue, 21 Jul 2015 01:41:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=oGPmCs3TUSByZS3A7kcTW9vXSxjyXcgzw1Io4wDBaGo=; b=GyZDxp5l8iX22cn1f1fqfUkvgcgth0gLWc1QMVTulBKwDTdJLMrIkThRJwdLPc8PoL DLiWoOiWQ37RHjdp44L+O3CGfsJAluAHr0RjEpP10gE0O+mzk7wcFNBDDcEZBvZsr/pQ 0ZqjpSrYZDswtza3mwRGTLcoXUiQPVHkaaaVAwG3VPAbsaq+KRGYe0cd0Xo50f3X/0D2 x9CxnaPA/YY9IDjx5UwLFDI61bHODI23oFW4gbrd9Qd4AkF1f9jmXM09pChlXCDcRUf9 Icj4CQZkZrwRycRMezRF6pcKn8OpmnPKrJ9iHhrKS2ywhESdfu+TPseOq7FgwwM1MZpl RNOw== X-Gm-Message-State: ALoCoQmAtyQ0IUkOaPpsBenTKGa1D3TPuzDGZzCLd4ZtF97Bt59g+UaLm58FwglwOLAhNt2zLI1b X-Received: by 10.70.1.102 with SMTP id 6mr70194952pdl.32.1437468083767; Tue, 21 Jul 2015 01:41:23 -0700 (PDT) Received: from orcus.lan (c-98-248-215-15.hsd1.ca.comcast.net. [98.248.215.15]) by smtp.gmail.com with ESMTPSA id y2sm26005110pdc.91.2015.07.21.01.41.21 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Jul 2015 01:41:22 -0700 (PDT) From: Lawrence D'Anna To: nbd@openwrt.org Date: Tue, 21 Jul 2015 01:40:51 -0700 Message-Id: X-Mailer: git-send-email 2.4.6 In-Reply-To: References: In-Reply-To: References: Cc: Lawrence D'Anna , openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH 2/3] prereq-build: use HOST* variables to test host compiler X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" We might need HOST_CPPFLAGS and HOST_LDFLAGS to find libraries. --- include/prereq-build.mk | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 53eac37..6c8cbf1 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -26,49 +26,39 @@ $(eval $(call TestHostCommand,case-sensitive-fs, \ $(eval $(call SetupHostCommand,gcc, \ Please install the GNU C Compiler (gcc), \ - $(CC) --version | grep gcc, \ - gcc --version | grep gcc, \ - gcc49 --version | grep gcc, \ - gcc48 --version | grep gcc, \ - gcc47 --version | grep gcc, \ - gcc46 --version | grep gcc, \ - gcc --version | grep Apple.LLVM )) + $(HOSTCC) --version | grep gcc, \ + $(HOSTCC) --version | grep Apple.LLVM )) $(eval $(call TestHostCommand,working-gcc, \ Please reinstall the GNU C Compiler - it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ - gcc -x c -o $(TMP_DIR)/a.out -)) + $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -x c -o $(TMP_DIR)/a.out -)) $(eval $(call SetupHostCommand,g++, \ Please install the GNU C++ Compiler (g++), \ - $(CXX) --version | grep g++, \ - g++ --version | grep g++, \ - g++49 --version | grep g++, \ - g++48 --version | grep g++, \ - g++47 --version | grep g++, \ - g++46 --version | grep g++, \ - g++ --version | grep Apple.LLVM )) + $(HOSTCXX) --version | grep g++, \ + $(HOSTCXX) --version | grep Apple.LLVM )) $(eval $(call TestHostCommand,working-g++, \ Please reinstall the GNU C++ Compiler - it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ - g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ + $(HOSTCXX) $(HOST_CFLAGS) $(HOST_LDFLAGS) -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ $(TMP_DIR)/a.out)) $(eval $(call TestHostCommand,ncurses, \ Please install ncurses. (Missing libncurses.so or ncurses.h), \ echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \ - gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses)) + $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses)) $(eval $(call TestHostCommand,zlib, \ Please install zlib. (Missing libz.so or zlib.h), \ echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ - gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - -lz)) + $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -include zlib.h -x c -o $(TMP_DIR)/a.out - -lz)) $(eval $(call TestHostCommand,libssl, \ Please install the openssl library (with development headers), \ echo 'int main(int argc, char **argv) { SSL_library_init(); return 0; }' | \ - gcc -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl)) + $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl)) $(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \