Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remaining refs to clang15 #2077

Merged
merged 3 commits into from
Sep 6, 2023
+4 −4
Merged

fix: remaining refs to clang15 #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a41439
fix: remaining refs to clang15
ludamad0 Sep 6, 2023
3d8ced5
fix: remaining refs to clang15
ludamad0 Sep 6, 2023
4c77c02
fix: remaining refs to clang15
ludamad0 Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circuits/cpp/barretenberg/barretenberg.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
},
"cmake.configureArgs": [
"--preset clang15",
"--preset clang16",
"-G Ninja",
"-g"
],
Expand Down
2 changes: 1 addition & 1 deletion circuits/cpp/barretenberg/cpp/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if [ "$OS" == "macos" ]; then
PRESET=default
else
if [ "$(which clang++-15)" != "" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this if condition be changed too?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah - if there's automerge and you have feedback like this you can not approve

PRESET=clang15
PRESET=clang16
else
PRESET=default
fi
Expand Down
4 changes: 2 additions & 2 deletions circuits/cpp/barretenberg/sol/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ cd ../../sol

echo "Building c++ binaries..."
cd ../cpp
cmake --preset clang15
cmake --build --preset clang15 --target solidity_key_gen solidity_proof_gen
cmake --preset clang16
cmake --build --preset clang16 --target solidity_key_gen solidity_proof_gen
cd ../sol

echo "Generating keys..."
Expand Down