From: Andrea Corallo <akrl@sdf.org>
Date: Mon, 13 Jul 2020 13:13:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'savahnna/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~515
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5be335e6b5d1a948a94206869d75c04684104203;p=emacs.git

Merge remote-tracking branch 'savahnna/master' into HEAD
---

5be335e6b5d1a948a94206869d75c04684104203
diff --cc src/Makefile.in
index 85709184da1,72d69fb7a3e..2f373d3eb7f
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -323,14 -323,8 +323,13 @@@ INTERVALS_H = dispextern.h intervals.h 
  
  GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
  
- GMP_LIB = @GMP_LIB@
- GMP_OBJ = @GMP_OBJ@
+ LIB_GMP = @LIB_GMP@
  
 +LIBGCCJIT = @LIBGCCJIT_LIB@
 +
 +## dynlib.o if necessary, else empty
 +DYNLIB_OBJ = @DYNLIB_OBJ@
 +
  RUN_TEMACS = ./temacs
  
  # Whether builds should contain details. '--no-build-details' or empty.
@@@ -536,7 -530,7 +535,7 @@@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUS
     $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(HARFBUZZ_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
     $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LCMS2_LIBS) \
     $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \
-    $(JSON_LIBS) $(GMP_LIB) $(LIBGCCJIT)
 -   $(JSON_LIBS) $(LIB_GMP)
++   $(JSON_LIBS) $(LIB_GMP) $(LIBGCCJIT)
  
  ## FORCE it so that admin/unidata can decide whether this file is
  ## up-to-date.  Although since charprop depends on bootstrap-emacs,