Disable libb2 on 32-bit platforms

cryspen · Jun 18, 2024 · c5ed381 · c5ed381
1 parent f50d170
commit c5ed381
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/actions/mach_benchmark/action.yml b/.github/actions/mach_benchmark/action.yml
@@ -25,6 +25,7 @@ runs:
     - run: |
         echo "BITS_FLAG=-m32" >> $GITHUB_ENV
         echo "OPENSSL_FLAG=--no-openssl" >> $GITHUB_ENV
+        echo "LIBB2_FLAG=--no-libb2" >> $GITHUB_ENV
       shell: bash
       if: ${{ inputs.bits == '32' }}
     - run: echo "BITS_FLAG=" > $GITHUB_ENV
@@ -54,4 +55,4 @@ runs:
       shell: bash
       run: |
         echo OPENSSL_HOME = $OPENSSL_HOME
-        ./mach build -v $BENCHMARK_COMMAND --release $BITS_FLAG $EDITION_FLAG $TARGET_FLAG $OPENSSL_FLAG ${{ inputs.args }}
+        ./mach build -v $BENCHMARK_COMMAND --release $BITS_FLAG $EDITION_FLAG $TARGET_FLAG $OPENSSL_FLAG $LIBB2_FLAG ${{ inputs.args }}
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Setup | Install multilib libraries
         if: ${{ matrix.bits == 32 }}
-        run: sudo apt-get install gcc-multilib g++-multilib libc6-i386
+        run: sudo apt-get install gcc-multilib g++-multilib
 
       - name: Setup GCC
         if: ${{ matrix.compiler == 'gcc' }}
@@ -54,6 +54,7 @@ jobs:
           echo "CXX=clang++" >> $GITHUB_ENV
 
       - name: Setup libb2
+        if: ${{ matrix.bits == 64 }}
         run: sudo apt-get install libb2-dev
 
       - name: Checkout