Backed out changeset bf55cb5e6b45 (bug 1740042) for causing build bustages. CLOSED TREE

build/unix/elfhack/Makefile.in

@@ -14,7 +14,7 @@ test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): %$(DLL_SUFFIX): %.$(OBJ_SUFFIX)
 	@echo === Use --disable-elf-hack until this is fixed.
 	@echo ===
 	# Fail if the library doesn't have $(DT_TYPE) .dynamic info
-	$(READELF) -d $@ | grep '($(DT_TYPE))'
+	$(TOOLCHAIN_PREFIX)readelf -d $@ | grep '($(DT_TYPE))'
 	@rm -f $@.bak
 	$(CURDIR)/elfhack -b -f $@
 	# Fail if the backup file doesn't exist

moz.configure

@@ -939,36 +939,32 @@ check_prog("7Z", ("7z", "7za"), allow_missing=True, when=target_is_windows)
 check_prog("UPX", ("upx",), allow_missing=True, when=target_is_windows)
 
 
-@template
-def llvm_tool(name):
-    @depends(host_c_compiler, c_compiler, bindgen_config_paths)
-    def llvm_tool(host_c_compiler, c_compiler, bindgen_config_paths):
-        clang = None
-        for compiler in (host_c_compiler, c_compiler):
-            if compiler and compiler.type == "clang":
-                clang = compiler.compiler
-                break
-            elif compiler and compiler.type == "clang-cl":
-                clang = os.path.join(os.path.dirname(compiler.compiler), "clang")
-                break
+@depends(host_c_compiler, c_compiler, bindgen_config_paths)
+def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
+    clang = None
+    for compiler in (host_c_compiler, c_compiler):
+        if compiler and compiler.type == "clang":
+            clang = compiler.compiler
+            break
+        elif compiler and compiler.type == "clang-cl":
+            clang = os.path.join(os.path.dirname(compiler.compiler), "clang")
+            break
 
-        if not clang and bindgen_config_paths:
-            clang = bindgen_config_paths.clang_path
-        tool = name
-        if clang:
-            out = check_cmd_output(
-                clang, "--print-prog-name=%s" % tool, onerror=lambda: None
-            )
-            if out:
-                tool = out.rstrip()
-        return (tool,)
-
-    return llvm_tool
+    if not clang and bindgen_config_paths:
+        clang = bindgen_config_paths.clang_path
+    llvm_objdump = "llvm-objdump"
+    if clang:
+        out = check_cmd_output(
+            clang, "--print-prog-name=llvm-objdump", onerror=lambda: None
+        )
+        if out:
+            llvm_objdump = out.rstrip()
+    return (llvm_objdump,)
 
 
 llvm_objdump = check_prog(
     "LLVM_OBJDUMP",
-    llvm_tool("llvm-objdump"),
+    llvm_objdump,
     what="llvm-objdump",
     when="--enable-compile-environment",
     paths=clang_search_path,
@@ -977,22 +973,6 @@ llvm_objdump = check_prog(
 add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
 
 
-@depends(llvm_tool("llvm-readelf"), toolchain_prefix)
-def readelf(llvm_readelf, toolchain_prefix):
-    commands = [llvm_readelf[0], "readelf"]
-    if toolchain_prefix:
-        commands.insert(1, "%sreadelf" % toolchain_prefix)
-    return tuple(commands)
-
-
-check_prog(
-    "READELF",
-    readelf,
-    what="readelf",
-    when="--enable-compile-environment",
-    paths=clang_search_path,
-)
-
 option("--enable-dtrace", help="Build with dtrace support")
 
 dtrace = check_header(

python/mozbuild/mozbuild/action/check_binary.py

@@ -27,7 +27,7 @@ HOST = {"platform": buildconfig.substs["HOST_OS_ARCH"], "readelf": "readelf"}
 
 TARGET = {
     "platform": buildconfig.substs["OS_TARGET"],
-    "readelf": buildconfig.substs.get("READELF", "readelf"),
+    "readelf": "{}readelf".format(buildconfig.substs.get("TOOLCHAIN_PREFIX", "")),
 }
 
 ADDR_RE = re.compile(r"[0-9a-f]{8,16}")

toolkit/library/build/dependentlibs.py

@@ -44,7 +44,7 @@ def dependentlibs_win32_objdump(lib):
 def dependentlibs_readelf(lib):
     """Returns the list of dependencies declared in the given ELF .so"""
     proc = subprocess.Popen(
-        [substs.get("READELF", "readelf"), "-d", lib],
+        [substs.get("TOOLCHAIN_PREFIX", "") + "readelf", "-d", lib],
         stdout=subprocess.PIPE,
         universal_newlines=True,
     )