fix: Set cflags on the configure and build step

AppImageCrafters · Dec 11, 2020 · 73a621f · 73a621f
1 parent 4b22540
commit 73a621f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,6 @@ jobs:
         if: ${{ env.TARGET_ARCH != 'x86_64' }}
         run: |
           if [ "$TARGET_ARCH" == "i386" ]; then
-            export CFLAGS=-m32;
             sudo apt-get install g++-multilib libc6-dev-i386
             exit 0
           fi
@@ -50,12 +49,20 @@ jobs:
       - name: Configure CMake ${{ matrix.TARGET_ARCH }}
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE="cmake/$TARGET_ARCH-toolchain.cmake"
+        run: |
+          if [ "$TARGET_ARCH" == "i386" ]; then
+                      export CFLAGS=-m32;
+          fi
+          cmake $GITHUB_WORKSPACE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE="cmake/$TARGET_ARCH-toolchain.cmake"
 
       - name: Build ${{ matrix.TARGET_ARCH }}
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: |
+          if [ "$TARGET_ARCH" == "i386" ]; then
+            export CFLAGS=-m32;
+          fi
+          cmake --build . --config $BUILD_TYPE
 
       - name: Test ${{ matrix.TARGET_ARCH }}
         working-directory: ${{runner.workspace}}/build

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -48,12 +48,20 @@ jobs:
       - name: Configure CMake ${{ matrix.TARGET_ARCH }}
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE="cmake/$TARGET_ARCH-toolchain.cmake"
+        run: |
+          if [ "$TARGET_ARCH" == "i386" ]; then
+                      export CFLAGS=-m32;
+          fi
+          cmake $GITHUB_WORKSPACE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE="cmake/$TARGET_ARCH-toolchain.cmake"
 
       - name: Build ${{ matrix.TARGET_ARCH }}
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: |
+          if [ "$TARGET_ARCH" == "i386" ]; then
+            export CFLAGS=-m32;
+          fi
+          cmake --build . --config $BUILD_TYPE
 
       - name: Test ${{ matrix.TARGET_ARCH }}
         working-directory: ${{runner.workspace}}/build

diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
@@ -48,12 +48,20 @@ jobs:
       - name: Configure CMake ${{ matrix.TARGET_ARCH }}
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE="cmake/$TARGET_ARCH-toolchain.cmake"
+        run: |
+          if [ "$TARGET_ARCH" == "i386" ]; then
+                      export CFLAGS=-m32;
+          fi
+          cmake $GITHUB_WORKSPACE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE="cmake/$TARGET_ARCH-toolchain.cmake"
 
       - name: Build ${{ matrix.TARGET_ARCH }}
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: |
+          if [ "$TARGET_ARCH" == "i386" ]; then
+            export CFLAGS=-m32;
+          fi
+          cmake --build . --config $BUILD_TYPE
 
       - name: Test ${{ matrix.TARGET_ARCH }}
         working-directory: ${{runner.workspace}}/build