[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp c35a515: Fix install with NS app bundle
From: |
Alan Third |
Subject: |
feature/native-comp c35a515: Fix install with NS app bundle |
Date: |
Wed, 7 Apr 2021 04:17:50 -0400 (EDT) |
branch: feature/native-comp
commit c35a515a2f7045f004299f601f6d1927ea16cd47
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Fix install with NS app bundle
* configure.ac: Set up CFLAGS and LDFLAGS to find a Homebrew
installation of libgccjit.
* Makefile.in (ELN_DESTDIR): Set to the app bundle resource dir when
required.
(install-eln): macOS install doesn't support the -D flag, so make the
directories separately.
---
Makefile.in | 6 ++++--
configure.ac | 10 ++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e318db7..efe89b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,10 +323,11 @@ COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
ifeq (${ns_self_contained},no)
BIN_DESTDIR='$(DESTDIR)${bindir}/'
+ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/
else
BIN_DESTDIR='${ns_appbindir}/'
+ELN_DESTDIR = ${ns_appresdir}/
endif
-ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/
all: ${SUBDIR} info
@@ -752,7 +753,8 @@ install-etc:
### Install native compiled Lisp files.
install-eln:
ifeq ($(HAVE_NATIVE_COMP),yes)
- find native-lisp -type f -exec ${INSTALL_DATA} -D "{}"
"$(ELN_DESTDIR){}" \;
+ find native-lisp -type d -exec $(MKDIR_P) "$(ELN_DESTDIR){}" \; ; \
+ find native-lisp -type f -exec ${INSTALL_DATA} "{}" "$(ELN_DESTDIR){}"
\;
endif
### Build Emacs and install it, stripping binaries while installing them.
diff --git a/configure.ac b/configure.ac
index 4284c99..698e8af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3801,6 +3801,16 @@ if test "${with_native_compilation}" != "no"; then
if test "${HAVE_ZLIB}" = no; then
AC_MSG_ERROR(['--with-nativecomp' requires zlib])
fi
+
+ # Ensure libgccjit installed by Homebrew can be found.
+ if test -n "$BREW"; then
+ BREW_LIBGCCJIT_PREFIX=`$BREW --prefix --installed libgccjit 2>/dev/null`
+ if test "$BREW_LIBGCCJIT_PREFIX"; then
+ CFLAGS="$CFLAGS -I${BREW_LIBGCCJIT_PREFIX}/include"
+ LDFLAGS="$LDFLAGS -L${BREW_LIBGCCJIT_PREFIX}/lib/gcc/10
-I${BREW_LIBGCCJIT_PREFIX}/include"
+ fi
+ fi
+
# Check if libgccjit is available.
AC_CHECK_LIB(gccjit, gcc_jit_context_acquire, [], [libgccjit_not_found])
AC_CHECK_HEADERS(libgccjit.h, [], [libgccjit_dev_not_found])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/native-comp c35a515: Fix install with NS app bundle,
Alan Third <=