Bug 1752064 - Move the remainder of AS to python configure. r=firefox…

…-build-system-reviewers,andi Differential Revision: https://phabricator.services.mozilla.com/D136981
Brli · Feb 3, 2022 · e33d4a0 · e33d4a0
1 parent 3539533
commit e33d4a0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
@@ -80,7 +80,6 @@ AC_PROG_CC
 AC_PROG_CXX
 
 AC_CHECK_PROGS(RANLIB, "${TOOLCHAIN_PREFIX}ranlib", :)
-AC_CHECK_PROGS(AS, "${TOOLCHAIN_PREFIX}as", :)
 AC_CHECK_PROGS(LIPO, "${TOOLCHAIN_PREFIX}lipo", :)
 AC_CHECK_PROGS(OTOOL, "${TOOLCHAIN_PREFIX}otool", :)
 AC_CHECK_PROGS(INSTALL_NAME_TOOL, "${TOOLCHAIN_PREFIX}install_name_tool", :)

diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -2416,9 +2416,7 @@ def as_with_flags(as_info, assembler, provided_assembler, c_compiler):
     return c_compiler.wrapper + [assembler] + c_compiler.flags
 
 
-add_old_configure_assignment("AS", as_with_flags)
-add_old_configure_assignment("ac_cv_prog_AS", as_with_flags)
-add_old_configure_assignment("ac_cv_path_AS", as_with_flags)
+set_config("AS", as_with_flags)
 
 
 @depends(assembler, c_compiler, extra_toolchain_flags)

diff --git a/js/src/old-configure.in b/js/src/old-configure.in
@@ -91,7 +91,6 @@ if test "$target" != "$host"; then
 else
     AC_PROG_CC
     AC_PROG_CXX
-    MOZ_PATH_PROGS(AS, $AS as, $CC)
 fi
 
 MOZ_TOOL_VARIABLES

diff --git a/old-configure.in b/old-configure.in
@@ -82,7 +82,6 @@ else
       sleep 2
     esac
     AC_PROG_CXX
-    MOZ_PATH_PROGS(AS, $AS as, $CC)
     AC_CHECK_PROGS(OTOOL, otool, :)
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,6 @@ else @@
           sleep 2
         esac
         AC_PROG_CXX
-        MOZ_PATH_PROGS(AS, $AS as, $CC)
         AC_CHECK_PROGS(OTOOL, otool, :)
     fi
@@ Expand Down @@