Skip to content

Commit

Permalink
Stop requiring openssl to bootstrap. (#24901)
Browse files Browse the repository at this point in the history
* Stop requiring openssl to bootstrap.

Bootstrap seems to do something with chip_crypto as part ofthe bootstrap
process.  Have it use the already-available boringssl for that instead of
requiring an external openssl.

Fixes #24897

* Also fix the no-cipd bootstrap.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Sep 2, 2023
1 parent a32fe16 commit 6922ac1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion scripts/environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"gn_root": ".",
"gn_targets": [":python_packages.install"],
"requirements": ["scripts/requirements.txt"],
"constraints": ["scripts/constraints.txt"]
"constraints": ["scripts/constraints.txt"],
"gn_args": ["chip_crypto=\"boringssl\""]
},
"required_submodules": ["third_party/pigweed/repo"],
"rosetta": "never",
Expand Down
3 changes: 2 additions & 1 deletion scripts/environment_no_cipd.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"gn_root": ".",
"gn_targets": [":python_packages.install"],
"requirements": ["scripts/requirements.txt"],
"constraints": ["scripts/constraints.txt"]
"constraints": ["scripts/constraints.txt"],
"gn_args": ["chip_crypto=\"boringssl\""]
},
"required_submodules": ["third_party/pigweed/repo"],
"rosetta": "never",
Expand Down

0 comments on commit 6922ac1

Please sign in to comment.