diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-04-05 12:01:25 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-04-05 12:01:25 +0000 |
| commit | d90bf58cf83c548d4ed98f8c6ee55a6b84af0834 (patch) | |
| tree | e364221b071fc7af079027aa7e6ac3d25435767a /www/chromium/files/patch-build_toolchain_gcc__toolchain.gni | |
| parent | Update CMake to latest release, 3.14.1 (diff) | |
www/chromium: Update to 73.0.3683.86
- Make existing patches apply cleanly
Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000
Submitted by: Matthias Wolf
MFH: 2019Q2
Diffstat (limited to 'www/chromium/files/patch-build_toolchain_gcc__toolchain.gni')
| -rw-r--r-- | www/chromium/files/patch-build_toolchain_gcc__toolchain.gni | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni new file mode 100644 index 000000000000..ffd043fda652 --- /dev/null +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -0,0 +1,45 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2019-03-11 22:00:52 UTC ++++ build/toolchain/gcc_toolchain.gni +@@ -47,6 +47,11 @@ analyzer_wrapper = + rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", + root_build_dir) + " --mode=clang" + ++declare_args() { ++ extra_cxxflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -610,13 +615,23 @@ template("clang_toolchain") { + } + + gcc_toolchain(target_name) { +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- cc = "$prefix/clang" +- cxx = "$prefix/clang++" +- ld = cxx +- readelf = "${toolprefix}readelf" +- ar = "${prefix}/llvm-ar" +- nm = "${toolprefix}nm" ++ if (is_bsd) { ++ prefix = "/usr/local/bin" ++ cc = "cc" ++ cxx = "c++" ++ ld = cxx ++ readelf = "readelf" ++ ar = "${prefix}/ar" ++ nm = "${toolprefix}nm" ++ } else { ++ prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ cc = "$prefix/clang" ++ cxx = "$prefix/clang++" ++ ld = cxx ++ readelf = "${toolprefix}readelf" ++ ar = "${prefix}/llvm-ar" ++ nm = "${toolprefix}nm" ++ } + + forward_variables_from(invoker, + [ |