diff options
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/Makefile.in | 24 | ||||
| -rw-r--r-- | nt/epaths.nt | 5 | ||||
| -rw-r--r-- | nt/gnulib-cfg.mk | 1 | ||||
| -rw-r--r-- | nt/mingw-cfg.site | 9 |
4 files changed, 16 insertions, 23 deletions
diff --git a/nt/Makefile.in b/nt/Makefile.in index aa3a76280ef..3274ff924f9 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -41,23 +41,8 @@ WERROR_CFLAGS = @WERROR_CFLAGS@ # Program name transformation. TRANSFORM = @program_transform_name@ -# 'make' verbosity. -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = - -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = - -AM_V_RC = $(am__v_RC_@AM_V@) -am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@) -am__v_RC_0 = @echo " RC " $@; -am__v_RC_1 = +top_builddir = @top_builddir@ +-include ${top_builddir}/src/verbose.mk # ==================== Where To Install Things ==================== @@ -185,7 +170,7 @@ $(DESTDIR)${archlibdir}: all fi .PHONY: install uninstall mostlyclean clean distclean maintainer-clean -.PHONY: bootstrap-clean extraclean check tags +.PHONY: bootstrap-clean check tags install: $(DESTDIR)${archlibdir} @echo @@ -218,9 +203,6 @@ distclean: clean bootstrap-clean maintainer-clean: distclean true -extraclean: maintainer-clean - -rm -f *~ \#* - ## Test the contents of the directory. check: @echo "We don't have any tests for the nt/ directory yet." diff --git a/nt/epaths.nt b/nt/epaths.nt index ad60f6c6fa0..a75ed52a34a 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -49,6 +49,11 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ */ #define PATH_SITELOADSEARCH "%emacs_dir%/share/emacs/@VER@/site-lisp;%emacs_dir%/share/emacs/site-lisp" +/* Like PATH_LOADSEARCH, but contains the relative path from the + installation directory. +*/ +#define PATH_REL_LOADSEARCH "" + /* Like PATH_LOADSEARCH, but used only during the build process when Emacs is dumping. Configure (using "make epaths-force-w32") sets this to $buildlisppath, which normally has the value: <srcdir>/lisp. diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk index 5cdbde6bb5b..c85b9150f0c 100644 --- a/nt/gnulib-cfg.mk +++ b/nt/gnulib-cfg.mk @@ -68,3 +68,4 @@ OMIT_GNULIB_MODULE_fchmodat = true OMIT_GNULIB_MODULE_lchmod = true OMIT_GNULIB_MODULE_futimens = true OMIT_GNULIB_MODULE_utimensat = true +OMIT_GNULIB_MODULE_file-has-acl = true diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site index 96300774871..6ab81e943f1 100644 --- a/nt/mingw-cfg.site +++ b/nt/mingw-cfg.site @@ -90,8 +90,9 @@ ac_cv_func_readlinkat=yes ac_cv_func_faccessat=yes # Avoid compiling Gnulib's canonicalize-lgpl.c, which fails ac_cv_func_canonicalize_file_name=yes -ac_cv_func_realpath="not-needed" -gl_cv_func_realpath_works="no-but-not-needed-so-yes" +# Implemented in w32.c +ac_cv_func_realpath=yes +gl_cv_func_realpath_works=yes # Implemented in w32.c ac_cv_func_fcntl=yes gl_cv_func_fcntl_f_dupfd_cloexec=yes @@ -158,6 +159,10 @@ gl_cv_func_copy_file_range=yes # We don't want to build Emacs so it depends on bcrypt.dll, since then # it will refuse to start on systems where that DLL is absent. gl_cv_lib_assume_bcrypt=no +# Force 'ac_cv_func_strsignal' to no as mingw64 libgccjit exports this +# symbol erroneously +# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45303#83>. +ac_cv_func_strsignal=no # Don't build the Gnulib free.c: it is not needed, since the w32 # implementation of 'free' doesn't touch errno, and it emits a # compilation warning. |