summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2019-02-03 10:53:22 +0100
committerAdrian Perez de Castro2019-02-03 10:53:22 +0100
commit719df8ebc22e5c455a2ac2ed6f3b7fd538378f1c (patch)
tree7490523ea2bcdc09ea3f187744c01f282cc946c5
parent1df7bdc024f528be7b7ce971a4c6b55ee6375746 (diff)
downloadaur-719df8ebc22e5c455a2ac2ed6f3b7fd538378f1c.tar.gz
Remove the now uneeded part of the patch to remove the ICF flag
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--gcc-support.patch9
3 files changed, 5 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 31f0b4f6ca6..e1aefde7949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gn-git
pkgdesc = Meta-build system which generates Ninja build files
- pkgver = r1523.377ad041
+ pkgver = r1525.5519dc2f
pkgrel = 1
url = https://gn.googlesource.com/gn
arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = gn-git
source = gn::git+https://gn.googlesource.com/gn
source = gcc-support.patch
sha512sums = SKIP
- sha512sums = 33b8f6da50dc4989ea2f5b13d638a24d89f6847ddb0fad8845575c6f490a25ff2772aee15d1d83e57a1554dee3cd19e88d69823664099714e551d3edd9c56aa7
+ sha512sums = fe2576ac88859494f7829de8b4fec1dc87ba9a418ac5b80028dea52471ffdfb65570728f5b2e8a9328d404394e6e22a5ebfd3765660e27324918f7a23fea3854
pkgname = gn-git
diff --git a/PKGBUILD b/PKGBUILD
index 4791cb43461..07213649624 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
#
pkgname=gn-git
pkgdesc='Meta-build system which generates Ninja build files'
-pkgver=r1523.377ad041
+pkgver=r1525.5519dc2f
pkgrel=1
license=('BSD')
arch=('x86_64' 'i686')
@@ -14,7 +14,7 @@ makedepends=('python2' 'ninja' 'git')
url='https://gn.googlesource.com/gn'
source=("gn::git+${url}" gcc-support.patch)
sha512sums=('SKIP'
- '33b8f6da50dc4989ea2f5b13d638a24d89f6847ddb0fad8845575c6f490a25ff2772aee15d1d83e57a1554dee3cd19e88d69823664099714e551d3edd9c56aa7')
+ 'fe2576ac88859494f7829de8b4fec1dc87ba9a418ac5b80028dea52471ffdfb65570728f5b2e8a9328d404394e6e22a5ebfd3765660e27324918f7a23fea3854')
pkgver () {
export GIT_DIR="${startdir}/gn"
@@ -28,7 +28,7 @@ prepare () {
build () {
cd gn
- CC=cc CXX=c++ AR=ar python2 build/gen.py --use-lto
+ CC=cc CXX=c++ AR=ar python2 build/gen.py --use-lto --no-strip
ninja -C out
}
diff --git a/gcc-support.patch b/gcc-support.patch
index e1f0794abf6..c4260b44c64 100644
--- a/gcc-support.patch
+++ b/gcc-support.patch
@@ -2,15 +2,6 @@ diff --git a/build/gen.py b/build/gen.py
index ee4f8e14..89714678 100755
--- a/build/gen.py
+++ b/build/gen.py
-@@ -299,7 +299,7 @@ def WriteGNNinja(path, platform, host, options):
- ldflags.append('-Wl,-strip-all')
-
- # Enable identical code-folding.
-- if not platform.is_darwin():
-+ if not platform.is_darwin() and "clang" in cc:
- ldflags.append('-Wl,--icf=all')
-
- cflags.extend([
@@ -332,8 +332,11 @@ def WriteGNNinja(path, platform, host, options):
ldflags.extend(['-maix64', '-pthread'])