diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2016-12-07 09:57:25 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2016-12-07 09:57:25 +0000 |
| commit | f03c5587cd5ee21f63f701e29d58ff83af45a442 (patch) | |
| tree | 9ebc1494255b922f73ee4bd9a6001d364dd1156f /www/chromium | |
| parent | 3b24b78662a8087ec31f29ea2773d6ca6e506e30 (diff) | |
| download | ports-f03c5587cd5ee21f63f701e29d58ff83af45a442.tar.gz ports-f03c5587cd5ee21f63f701e29d58ff83af45a442.zip | |
Notes
Diffstat (limited to 'www/chromium')
| -rw-r--r-- | www/chromium/Makefile | 3 | ||||
| -rw-r--r-- | www/chromium/files/patch-build_toolchain_gcc__toolchain.gni | 18 |
2 files changed, 17 insertions, 4 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 702b19bf173e..d4f0f6b3eec5 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -191,7 +191,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1 +GN_ARGS+= extra_cxxflags="-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1" \ + extra_ldflags="-L${LOCALBASE}/lib" .endif .if ${OSVERSION} < 1100000 diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 26caf74a8e2a..f0c64bdd270b 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,18 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/toolchain/gcc_toolchain.gni 2016-10-13 10:28:11.777849000 +0300 -@@ -453,14 +453,28 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2016-11-10 20:02:09 UTC ++++ build/toolchain/gcc_toolchain.gni +@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni + import("//build/toolchain/goma.gni") + import("//build/toolchain/toolchain.gni") + ++declare_args() { ++ extra_cxxflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -453,14 +458,28 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { |