aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorPo Lu2023-05-15 11:25:23 +0800
committerPo Lu2023-05-15 11:25:23 +0800
commit89584de2a54f90984dac2b8602d5cb08673cd7a9 (patch)
treec1046a7a4e5b1eeb7dbe3ac42728464727831176 /msdos
parent5a3f009ad70d87366889e977d3b7d13f01b93e69 (diff)
downloademacs-89584de2a54f90984dac2b8602d5cb08673cd7a9.tar.gz
emacs-89584de2a54f90984dac2b8602d5cb08673cd7a9.zip
Fix the MS-DOS build
* msdos/sed1v2.inp: Fix removal of ANDROID_BUILD_CFLAGS. * msdos/sedlibmk.inp: Clear DIR_HAS_FD_MEMBER and LOCALE_FR_UTF8.
Diffstat (limited to 'msdos')
-rw-r--r--msdos/sed1v2.inp2
-rw-r--r--msdos/sedlibmk.inp3
2 files changed, 4 insertions, 1 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 71aa27afce2..1b96cc7ddc4 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -206,7 +206,7 @@ s/ *@WEBP_LIBS@//
206/^ANDROID_OBJ *=/s/@ANDROID_OBJ@// 206/^ANDROID_OBJ *=/s/@ANDROID_OBJ@//
207/^ANDROID_LIBS *=/s/@ANDROID_LIBS@// 207/^ANDROID_LIBS *=/s/@ANDROID_LIBS@//
208/^ANDROID_LDFLAGS *=/s/@ANDROID_LDFLAGS@// 208/^ANDROID_LDFLAGS *=/s/@ANDROID_LDFLAGS@//
209/^ANDROID_BUILD_CFLAGS *=/s/@ANDROID_CFLAGS@// 209/^ANDROID_BUILD_CFLAGS *=/s/@ANDROID_BUILD_CFLAGS@//
210/^LIBGMP_CFLAGS *=/s/@LIBGMP_CFLAGS@// 210/^LIBGMP_CFLAGS *=/s/@LIBGMP_CFLAGS@//
211/^SQLITE3_CFLAGS *=/s/@SQLITE3_CFLAGS@// 211/^SQLITE3_CFLAGS *=/s/@SQLITE3_CFLAGS@//
212/^LIBSELINUX_CFLAGS *=/s/@LIBSELINUX_CFLAGS@// 212/^LIBSELINUX_CFLAGS *=/s/@LIBSELINUX_CFLAGS@//
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index cca2b46b018..09f98f8e0a2 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -200,6 +200,9 @@ s/@PACKAGE@/emacs/
200/^GL_GNULIB_[^ =]* *= *@/s/@[^@\n]*@/0/ 200/^GL_GNULIB_[^ =]* *= *@/s/@[^@\n]*@/0/
201/^GL_GSETTINGS_CFLAGS *=/s/@[^@\n]*@// 201/^GL_GSETTINGS_CFLAGS *=/s/@[^@\n]*@//
202/^GL_GSETTINGS_LIBS *=/s/@[^@\n]*@// 202/^GL_GSETTINGS_LIBS *=/s/@[^@\n]*@//
203# Miscellaneous variables.
204/^DIR_HAS_FD_MEMBER *=/s/@DIR_HAS_FD_MEMBER@/0/
205/^LOCALE_FR_UTF8 *=/s/@LOCALE_FR_UTF8@/none/
203# 206#
204# Edit the HAVE_foo variables 207# Edit the HAVE_foo variables
205/^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/ 208/^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/