summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2019-10-23 13:48:54 +0000
committerPedro A. López-Valencia2019-10-23 13:48:54 +0000
commita946c75b989db2e36ff17df2b2d78d1bfa962c8a (patch)
treef0ee6f6e6b35931b322e2a24b0aac0bdc26b5c4d
parent6eab19e19f468a40591c41b3c1124aa623094350 (diff)
downloadaur-a946c75b989db2e36ff17df2b2d78d1bfa962c8a.tar.gz
Fix gcc vs clang lfo flags
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5412ce21e162..6a90bb358f74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development.
- pkgver = 27.0.50.139156
+ pkgver = 27.0.50.139164
pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = emacs-git
makedepends = git
makedepends = clang
makedepends = lld
+ makedepends = llvm
depends = alsa-lib
depends = gnutls
depends = libxml2
diff --git a/PKGBUILD b/PKGBUILD
index a3db475b0edc..d0e8d65ba2bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -58,7 +58,7 @@ NOGZ="YES" # Don't compress .el files.
################################################################################
pkgname="emacs-git"
-pkgver=27.0.50.139156
+pkgver=27.0.50.139164
pkgrel=1
pkgdesc="GNU Emacs. Development."
arch=('x86_64') # Arch Linux only. Derivative users are on their own.
@@ -79,9 +79,12 @@ md5sums=('SKIP')
################################################################################
-if [[ $LTO = "YES" ]]; then
+if [[ $LTO = "YES" ]] && [[ $CLANG != "YES" ]]; then
CFLAGS+=" -flto -fuse-linker-plugin"
CXXFLAGS+=" -flto -fuse-linker-plugin"
+else
+ CFLAGS+=" -flto"
+ CXXFLAGS+=" -flto"
fi
if [[ $CLANG = "YES" ]]; then
@@ -89,9 +92,11 @@ if [[ $CLANG = "YES" ]]; then
export CXX="/usr/bin/clang++" ;
export CPP="/usr/bin/clang -E" ;
export LD="/usr/bin/lld" ;
+ export AR="/usr/bin/llvm-ar" ;
+ export AS="/usr/bin/llvm-as" ;
export CCFLAGS+=' -fuse-ld=lld' ;
export CXXFLAGS+=' -fuse-ld=lld' ;
- makedepends+=( 'clang' 'lld') ;
+ makedepends+=( 'clang' 'lld' 'llvm') ;
fi
if [[ $NOTKIT = "YES" ]]; then