Skip to content

Commit ebb9090

Browse files
nanayaFishrock123
authored andcommitted
tools: skip workaround for newer llvm
PR-URL: #14077 Fixes: #14076 Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent c0ea5d8 commit ebb9090

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

common.gypi

+9-3
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,15 @@
407407
'libraries': [ '-lelf' ],
408408
}],
409409
['OS=="freebsd"', {
410-
# Use this flag because on FreeBSD std::pairs copy constructor is non-trivial
411-
# https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
412-
'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
410+
'conditions': [
411+
['llvm_version < "4.0"', {
412+
# Use this flag because on FreeBSD std::pairs copy constructor is non-trivial.
413+
# Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later.
414+
# Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
415+
# Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup
416+
'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
417+
}],
418+
],
413419
'ldflags': [
414420
'-Wl,--export-dynamic',
415421
],

0 commit comments

Comments
 (0)