maintainer-approval requested: [Bug 258837] www/firefox: unbreak llvm=13 build : [Attachment 228314] v1 (use "git am")

From: <>
Date: Fri, 01 Oct 2021 10:56:33 UTC
Evgeniy Khramtsov <> has asked freebsd-gecko (Nobody)
<> for maintainer-approval:
Bug 258837: www/firefox: unbreak llvm=13 build

Attachment 228314: v1 (use "git am")

--- Description ---
Restore patch-bug1628567 to unbreak glslopt crate build due to cc crate
passing Rust target "x86_64-unknown-freebsd" without OS version to clang++:

[glslopt 0.1.9] cargo:warning=/wrkdirs/usr/ports/www/firefox/work/.build/
ist/system_wrappers/new:3:15: fatal error: 'new' file not found
[glslopt 0.1.9] cargo:warning=#include_next <new>

Build passed on 12.2/amd64 jail with this patch (llvm=13 and llvm=12) and
without (llvm=12). Also, build still passes after forced LTO with llvm=13 via
reverting ports 4e67118c7.

Note, ports llvm still uses base libc++ (bug 215193), so this helps bug 258209
only partly. Upstream bug 1731582 patches might be needed for in base libc++