Commit 0a40a11
build: fix bsd build with gcc
BSD build with GCC was broken because it was checking for the
llvm_version variable on common.gypi, even though llvm wasn't
installed (or needed).
PR-URL: #16737
Fixes: #16257
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Refael Ackermann <refack@gmail.com>1 parent a0acd91 commit 0a40a11
3 files changed
Lines changed: 2 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -418,7 +418,7 @@ | |||
| 418 | 418 | }], | |
| 419 | 419 | ['OS=="freebsd"', { | |
| 420 | 420 | 'conditions': [ | |
| 421 | - ['llvm_version < "4.0"', { | ||
| 421 | + ['"0" < llvm_version < "4.0"', { | ||
| 422 | 422 | # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial. | |
| 423 | 423 | # Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later. | |
| 424 | 424 | # Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -692,8 +692,7 @@ def check_compiler(o): | |||
| 692 | 692 | # to a version that is not completely ancient. | |
| 693 | 693 | warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC) | |
| 694 | 694 | ||
| 695 | - if is_clang: | ||
| 696 | - o['variables']['llvm_version'] = get_llvm_version(CC) | ||
| 695 | + o['variables']['llvm_version'] = get_llvm_version(CC) if is_clang else 0 | ||
| 697 | 696 | ||
| 698 | 697 | # Need xcode_version or gas_version when openssl asm files are compiled. | |
| 699 | 698 | if options.without_ssl or options.openssl_no_asm or options.shared_openssl: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,7 +7,6 @@ | |||
| 7 | 7 | 'is_clang': 0, | |
| 8 | 8 | 'gcc_version': 0, | |
| 9 | 9 | 'openssl_no_asm%': 0, | |
| 10 | - 'llvm_version%': 0, | ||
| 11 | 10 | 'xcode_version%': 0, | |
| 12 | 11 | 'gas_version%': 0, | |
| 13 | 12 | 'openssl_fips%': 'false', | |
0 commit comments