Commit ebb9090
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 <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>1 parent c0ea5d8 commit ebb9090
1 file changed
Lines changed: 9 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -407,9 +407,15 @@ | |||
| 407 | 407 | 'libraries': [ '-lelf' ], | |
| 408 | 408 | }], | |
| 409 | 409 | ['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 | + ], | ||
| 413 | 419 | 'ldflags': [ | |
| 414 | 420 | '-Wl,--export-dynamic', | |
| 415 | 421 | ], | |
0 commit comments