Bug 1412460 - Simplify config.guess invocation; r?build draft
authorGregory Szorc <gps@mozilla.com>
Fri, 27 Oct 2017 16:05:03 -0700
changeset 688047 2705b58446f0407a4b00b901beadda73066e7e7d
parent 688046 770e832324b428f1ef3d0e9f2f8ecf3238a1f9ae
child 688048 3ac6e9702f96eb0906fdeefaebb7433a1259ec39
push id86650
push usergszorc@mozilla.com
push dateSat, 28 Oct 2017 01:33:47 +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