Bug 1412460 - Simplify config.guess invocation; r?build draft
authorGregory Szorc <gps@mozilla.com>
Fri, 27 Oct 2017 16:05:03 -0700
changeset 690349 3e204c23c077e5beb890af57dad6b7fe9c82bede
parent 690348 1c3021164d7a6208ca444f0c913fcbe89b6ba8b4
child 690350 aedb01ab8b0c1f0bb03e5597a918ade6f78e7625
push id87287
push usergszorc@mozilla.com
push dateWed, 01 Nov 2017 22:07:23 +0000
reviewersbuild
bugs1412460
milestone58.0a1
Bug 1412460 - Simplify config.guess invocation; r?build The config.guess file is checked into source control. I'm not sure under what conditions we wouldn't fail to find this file. So the $(wildcard) shouldn't be necessary. MozReview-Commit-ID: KCctPFW3Eab
client.mk
--- a/client.mk
+++ b/client.mk
@@ -46,21 +46,17 @@ else
 TOPSRCDIR := $(CWD)
 endif
 endif
 
 SH := /bin/sh
 PERL ?= perl
 PYTHON ?= $(shell which python2.7 > /dev/null 2>&1 && echo python2.7 || echo python)
 
-CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
-ifdef CONFIG_GUESS_SCRIPT
-  CONFIG_GUESS := $(shell $(CONFIG_GUESS_SCRIPT))
-endif
-
+CONFIG_GUESS := $(shell $(TOPSRCDIR)/build/autoconf/config.guess)
 
 ####################################
 # Sanity checks
 
 # Windows checks.
 ifneq (,$(findstring mingw,$(CONFIG_GUESS)))
 
 # check for CRLF line endings