Bug 1412460 - Simplify config.guess invocation; r=mshal
authorGregory Szorc <gps@mozilla.com>
Fri, 27 Oct 2017 16:05:03 -0700
changeset 440486 e5329ac331301b546fabc42f4f387e20d40e5fb2
parent 440485 027f1c5da98e7212c1b229e603399fde263df92a
child 440487 f47abc8062fc763f8ab5db9bbac15a23ed9f51c1
push id8114
push userjlorenzo@mozilla.com
push dateThu, 02 Nov 2017 16:33:21 +0000
treeherdermozilla-beta@73e0d89a540f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1412460
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1412460 - Simplify config.guess invocation; r=mshal 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