Default to the portable version of blst (#12720)

* Default to the portable version of blst * Update based on review comments --------- Co-authored-by: Preston Van Loon <[email protected]>
prysmaticlabs · Sep 29, 2023 · b667c68 · b667c68
1 parent fb19ee8
commit b667c68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -15,7 +15,7 @@ coverage --define=coverage_enabled=1
 # Stamp binaries with git information
 build --workspace_status_command=./hack/workspace_status.sh
 
-build --define blst_disabled=false --define blst_modern=true
+build --define blst_disabled=false
 run --define blst_disabled=false
 
 build:blst_disabled --define blst_disabled=true

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -75,14 +75,14 @@ jobs:
       - name: Build
         # Use blst tag to allow go and bazel builds for blst.
         run: go build -v ./...
-        env: 
-           CGO_CFLAGS: "-O -D__BLST_PORTABLE__"
+        env:
+           CGO_CFLAGS: "-O2 -D__BLST_PORTABLE__"
         # fuzz leverage go tag based stubs at compile time.
         # Building and testing with these tags should be checked and enforced at pre-submit.
       - name: Test for fuzzing
         run: go test  -tags=fuzz,develop ./...  -test.run=^Fuzz
-        env: 
-           CGO_CFLAGS: "-O -D__BLST_PORTABLE__"
+        env:
+           CGO_CFLAGS: "-O2 -D__BLST_PORTABLE__"
 
 # Tests run via Bazel for now...
 #      - name: Test

diff --git a/third_party/blst/blst.BUILD b/third_party/blst/blst.BUILD
@@ -23,7 +23,7 @@ go_library(
         "-D__BLST_CGO__",
         "-Ibindings",
         "-Isrc",
-        "-O",
+        "-O2",
     ] + select({
         "@io_bazel_rules_go//go/platform:amd64": [
             "-mno-avx",
@@ -86,7 +86,7 @@ cc_library(
         "build/assembly.S",
     ],
     copts = [
-            "-O",
+            "-O2",
     ] + select({
         "@io_bazel_rules_go//go/platform:amd64": [
             "-mno-avx",