Fix macOS unoptimised builds

.github/workflows/build-check-freebsd.yml

@@ -21,6 +21,6 @@ jobs:
           sudo pkg install -y autoconf automake libtool
           ./automake.sh
           ./configure
-          make
+          make -j"$(nproc)"
           make check
           make distcheck

.github/workflows/build-check-linux.yml

@@ -15,6 +15,6 @@ jobs:
       run: |
         ./automake.sh
         ./configure
-        make
+        make -j"$(nproc)"
         make check
         make distcheck

.github/workflows/build-check-macos.yml

@@ -18,6 +18,6 @@ jobs:
       run: |
         ./automake.sh
         ./configure
-        make
+        make -j"$(sysctl -n hw.ncpu)"
         make check
         make distcheck

.github/workflows/build-release.yml

@@ -63,7 +63,7 @@ jobs:
       run: |
         ./automake.sh
         ./configure ${{ matrix.configure_host }}
-        make
+        make -j"$(nproc)"
 
     - name: Upload binary artifact
       uses: actions/upload-artifact@v7
@@ -117,11 +117,8 @@ jobs:
         include:
         - arch: amd64
           xcxxflags: -arch x86_64 -mmacosx-version-min=10.13
-          configure_host: --host=x86_64-apple-darwin
         - arch: arm64
-          xcxxflags: -mmacosx-version-min=11.0
-        - arch: universal
-          xcxxflags: -arch x86_64 -arch arm64 -mmacosx-version-min=10.13
+          xcxxflags: -arch arm64 -mmacosx-version-min=11.0
 
     runs-on: macos-latest
 
@@ -131,13 +128,16 @@ jobs:
     - name: prepare
       run: brew install automake
 
+    # NOTE: setting CFLAGS/CXXFLAGS suppresses autoconf's default "-g -O2",
+    # so -O2 must be passed explicitly or the build ends up unoptimised.
     - name: Build
       env:
-        CXXFLAGS: ${{ matrix.xcxxflags }}
+        CFLAGS: -O3 ${{ matrix.xcxxflags }}
+        CXXFLAGS: -O3 ${{ matrix.xcxxflags }}
       run: |
         ./automake.sh
-        ./configure ${{ matrix.configure_host }}
-        make
+        ./configure
+        make -j"$(sysctl -n hw.ncpu)"
         strip par2
 
     - name: Upload binary artifact
@@ -148,6 +148,34 @@ jobs:
           par2
         retention-days: 5
 
+  build-macos-universal:
+    needs:
+    - build-macos
+
+    runs-on: macos-latest
+
+    steps:
+    - name: Download slices
+      uses: actions/download-artifact@v7
+      with:
+        pattern: par2cmdline-macos-*
+
+    - name: Create universal binary
+      run: |
+        lipo -create \
+          par2cmdline-macos-amd64/par2 \
+          par2cmdline-macos-arm64/par2 \
+          -output par2
+        lipo -info par2
+
+    - name: Upload binary artifact
+      uses: actions/upload-artifact@v7
+      with:
+        name: par2cmdline-macos-universal
+        path: |
+          par2
+        retention-days: 5
+
   build-freebsd:
     needs:
     - build-check-freebsd

libpar2.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

par2cmdline.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/commandline_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/crc_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/criticalpacket_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/descriptionpacket_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/diskfile_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/galois_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/letype_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/libpar2_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/md5_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/reedsolomon_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

tests/utf8_test.vcxproj

@@ -35,7 +35,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">