Skip to content

Commit 0a40a11

Browse files
Matheus MarchiniMylesBorins
Matheus Marchini
authored andcommitted
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 <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jon Moss <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent a0acd91 commit 0a40a11

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
}],
419419
['OS=="freebsd"', {
420420
'conditions': [
421-
['llvm_version < "4.0"', {
421+
['"0" < llvm_version < "4.0"', {
422422
# Use this flag because on FreeBSD std::pairs copy constructor is non-trivial.
423423
# Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later.
424424
# Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html

configure

+1-2
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,7 @@ def check_compiler(o):
692692
# to a version that is not completely ancient.
693693
warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC)
694694

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
697696

698697
# Need xcode_version or gas_version when openssl asm files are compiled.
699698
if options.without_ssl or options.openssl_no_asm or options.shared_openssl:

deps/openssl/openssl.gyp

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
'is_clang': 0,
88
'gcc_version': 0,
99
'openssl_no_asm%': 0,
10-
'llvm_version%': 0,
1110
'xcode_version%': 0,
1211
'gas_version%': 0,
1312
'openssl_fips%': 'false',

0 commit comments

Comments
 (0)