procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change --with-nativecomp to --with-native-compilation in messages

Browse source 
* configure.ac:
* test/infra/Dockerfile.emba:
* test/infra/gitlab-ci.yml: Fix mentions of --with-nativecomp
(bug#50255).
This commit is contained in:
Clément Pit-Claudel 2021-08-29 21:15:06 +02:00 • committed by Lars Ingebrigtsen
parent dce5f7aed6
commit 9117a76b53
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -3795,7 +3795,7 @@ AC_DEFUN([libgccjit_dev_not_found], [
not found.
Please try installing libgccjit-dev or a similar package.
If you are sure you want Emacs be compiled without ELisp native compiler,
pass the --without-nativecomp option to configure.])])
pass the --without-native-compilation option to configure.])])
AC_DEFUN([libgccjit_broken], [
AC_MSG_ERROR([The installed libgccjit failed to compile and run a test program using
@ -3814,10 +3814,10 @@ LIBGCCJIT_LIBS=
LIBGCCJIT_CFLAGS=
if test "${with_native_compilation}" != "no"; then
if test "${HAVE_PDUMPER}" = no; then
AC_MSG_ERROR(['--with-nativecomp' requires '--with-dumping=pdumper'])
AC_MSG_ERROR(['--with-native-compilation' requires '--with-dumping=pdumper'])
fi
if test "${HAVE_ZLIB}" = no; then
AC_MSG_ERROR(['--with-nativecomp' requires zlib])
AC_MSG_ERROR(['--with-native-compilation' requires zlib])
fi
# Ensure libgccjit installed by Homebrew can be found.

2
test/infra/Dockerfile.emba
View file

@ -82,6 +82,6 @@ ARG make_bootstrap_params=""
COPY . /checkout
WORKDIR /checkout
RUN ./autogen.sh autoconf
RUN ./configure --with-nativecomp
RUN ./configure --with-native-compilation
RUN make bootstrap -j2 NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"'
RUN make -j4

6
test/infra/gitlab-ci.yml
View file

@ -291,7 +291,7 @@ build-native-bootstrap-speed0:
# script:
# - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libgccjit-6-dev
# - ./autogen.sh autoconf
# - ./configure --with-nativecomp
# - ./configure --with-native-compilation
# - make bootstrap NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"' -j2
# timeout: 8 hours
@ -300,7 +300,7 @@ build-native-bootstrap-speed0:
# script:
# - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libgccjit-6-dev
# - ./autogen.sh autoconf
# - ./configure --with-nativecomp
# - ./configure --with-native-compilation
# - make bootstrap BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 1)"'
# timeout: 8 hours
@ -309,7 +309,7 @@ build-native-bootstrap-speed0:
# script:
# - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libgccjit-6-dev
# - ./autogen.sh autoconf
# - ./configure --with-nativecomp
# - ./configure --with-native-compilation
# - make bootstrap
# timeout: 8 hours