Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 986e439

Browse filesBrowse files
Matheus Marchinigibfahn
Matheus Marchini
authored and
gibfahn
committed
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 51e660a commit 986e439
Copy full SHA for 986e439

File tree

Expand file treeCollapse file tree

3 files changed

+2
-4
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+2
-4
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@
414414
}],
415415
['OS=="freebsd"', {
416416
'conditions': [
417-
['llvm_version < "4.0"', {
417+
['"0" < llvm_version < "4.0"', {
418418
# Use this flag because on FreeBSD std::pairs copy constructor is non-trivial.
419419
# Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later.
420420
# Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
Collapse file

‎configure‎

Copy file name to clipboardExpand all lines: configure
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,7 @@ def check_compiler(o):
686686
# to a version that is not completely ancient.
687687
warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC)
688688

689-
if is_clang:
690-
o['variables']['llvm_version'] = get_llvm_version(CC)
689+
o['variables']['llvm_version'] = get_llvm_version(CC) if is_clang else 0
691690

692691
# Need xcode_version or gas_version when openssl asm files are compiled.
693692
if options.without_ssl or options.openssl_no_asm or options.shared_openssl:
Collapse file

‎deps/openssl/openssl.gyp‎

Copy file name to clipboardExpand all lines: deps/openssl/openssl.gyp
-1Lines changed: 0 additions & 1 deletion
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.