From: Andrea Corallo <akrl@sdf.org>
Date: Mon, 24 Aug 2020 08:25:36 +0000 (+0200)
Subject: * src/comp.c (add_driver_options): Fix missing condition + clean-up pragma
X-Git-Tag: emacs-28.0.90~2727^2~475^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8321f07ce874e9c7294cdb8e15f8a08ba064aa7;p=emacs.git

* src/comp.c (add_driver_options): Fix missing condition + clean-up pragma
---

diff --git a/src/comp.c b/src/comp.c
index 5bfbfbaf3c9..7f6bbe395b5 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4146,13 +4146,12 @@ add_driver_options (void)
 
 #if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) \
   || defined (WINDOWSNT)
-#pragma GCC diagnostic ignored "-Waddress"
   load_gccjit_if_necessary (true);
-  FOR_EACH_TAIL (options)
-    gcc_jit_context_add_driver_option (comp.ctxt,
-				       SSDATA (XCAR (options)));
+  if (!NILP (Fcomp_native_driver_options_available_p ()))
+    FOR_EACH_TAIL (options)
+      gcc_jit_context_add_driver_option (comp.ctxt,
+					 SSDATA (XCAR (options)));
   return;
-#pragma GCC diagnostic pop
 #endif
   if (CONSP (options))
     xsignal1 (Qnative_compiler_error,