Skip to content

Commit 47d4e9d

Browse files
committed
Backed out changeset 23b5cf2c6824 (bug 1457483) for build bustages e.g. OSError: [Errno 13] Permission denied/ make[2]: *** [check-vanilla-allocations] Error 1 on a CLOSED TREE
1 parent 66ff6f1 commit 47d4e9d

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

config/check_vanilla_allocations.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import re
4343
import subprocess
4444
import sys
45-
import buildconfig
4645

4746
# The obvious way to implement this script is to search for occurrences of
4847
# malloc et al, succeed if none are found, and fail is some are found.
@@ -77,8 +76,7 @@ def main():
7776
# -u: show only undefined symbols
7877
# -C: demangle symbol names
7978
# -A: show an object filename for each undefined symbol
80-
nm = buildconfig.substs.get('NM', 'nm')
81-
cmd = [nm, '-u', '-C', '-A', args.file]
79+
cmd = ['nm', '-u', '-C', '-A', args.file]
8280
lines = subprocess.check_output(cmd, universal_newlines=True,
8381
stderr=subprocess.PIPE).split('\n')
8482

js/src/old-configure.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,6 @@ AC_SUBST(AR)
16871687
AC_SUBST(AR_FLAGS)
16881688
AC_SUBST(AR_EXTRACT)
16891689
AC_SUBST(AS)
1690-
AC_SUBST(NM)
16911690
AC_SUBST_LIST(ASFLAGS)
16921691
AC_SUBST(AS_DASH_C_FLAG)
16931692
AC_SUBST(RC)

old-configure.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4059,7 +4059,6 @@ AC_SUBST(AR)
40594059
AC_SUBST(AR_FLAGS)
40604060
AC_SUBST(AR_EXTRACT)
40614061
AC_SUBST(AS)
4062-
AC_SUBST(NM)
40634062
AC_SUBST_LIST(ASFLAGS)
40644063
AC_SUBST(AS_DASH_C_FLAG)
40654064
AC_SUBST(RC)

0 commit comments

Comments
 (0)