From 37098f6c5e33f52276caa460a2b47082ce2d2249 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 8 Sep 2014 20:38:21 -0400
Subject: [PATCH] Backed out changeset 9a796d86bae8 (bug 1063728) until people
 agree what they want to do here

---
 config/check_spidermonkey_style.py | 4 ----
 js/src/Makefile.in                 | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py
index 439f4e9ee985..8aa5150eb324 100644
--- a/config/check_spidermonkey_style.py
+++ b/config/check_spidermonkey_style.py
@@ -574,10 +574,6 @@ def tarjan(V, E):
 
 
 def main():
-    # Suppress the build time check if MOZ_NO_BUILD_TIME_SM_CHECKS is set.
-    if "MOZ_NO_BUILD_TIME_SM_CHECKS" in os.environ:
-        sys.exit(0)
-
     ok = check_style()
 
     if ok:
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 2fdf22701e73..372bcbd88f06 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -137,7 +137,7 @@ check-jit-test::
 	        --no-slow --no-progress --tinderbox --tbpl $(JITTEST_VALGRIND_FLAG) \
 	        $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
 
-export:: check-style
+check:: check-style
 
 # jstests doesn't have a --jitflags option, so we need to loop, updating the
 # exit code (RC) after each invocation.