From 711ffb4939123528bb49ffe298825355183a4a71 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 21 May 2020 22:38:47 +0000
Subject: [PATCH] Bug 1639815 - Move --disable-icf to python configure.
 r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D76290
---
 build/autoconf/compiler-opts.m4   | 5 -----
 build/moz.configure/old.configure | 1 -
 moz.configure                     | 6 ++++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index f6240357245e..7ace6b038459 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -94,11 +94,6 @@ dnl ========================================================
 dnl = Identical Code Folding
 dnl ========================================================
 
-MOZ_ARG_DISABLE_BOOL(icf,
-[  --disable-icf          Disable Identical Code Folding],
-    MOZ_DISABLE_ICF=1,
-    MOZ_DISABLE_ICF= )
-
 if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF" -a -z "$DEVELOPER_OPTIONS"; then
     AC_CACHE_CHECK([whether the linker supports Identical Code Folding],
         LD_SUPPORTS_ICF,
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index a356738765ac..2260dcab3150 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -215,7 +215,6 @@ def old_configure_options(*options):
     '--enable-debug-js-modules',
     '--enable-dump-painting',
     '--enable-extensions',
-    '--enable-icf',
     '--enable-install-strip',
     '--enable-libproxy',
     '--enable-logrefcnt',
diff --git a/moz.configure b/moz.configure
index d2d0127168a4..b8a9a9e5faeb 100755
--- a/moz.configure
+++ b/moz.configure
@@ -645,6 +645,12 @@ set_config('HAVE_DTRACE', True, when=dtrace)
 set_define('INCLUDE_MOZILLA_DTRACE', True, when=dtrace)
 add_old_configure_assignment('enable_dtrace', 'yes', when=dtrace)
 
+
+js_option('--disable-icf', help='Disable Identical Code Folding')
+
+add_old_configure_assignment(
+    'MOZ_DISABLE_ICF', '1', when=depends('--enable-icf')(lambda x: not x))
+
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure