Reverting back cause -fpermissive of cc1 in vvenc

MartinEesmaa · Oct 29, 2024 · b3d160b · b3d160b
1 parent 5780695
commit b3d160b
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh
@@ -6,18 +6,17 @@ ffbuild_enabled() {
     return 0
 }
 
+fixarm64=()
+
 ffbuild_dockerbuild() {
 
     mkdir build && cd build
 
-    local armsimd=()
-    if [[ $TARGET == *arm* ]]; then
-        armsimd+=( -DVVENC_ENABLE_ARM_SIMD=OFF -DVVENC_ENABLE_X86_SIMD=OFF )
-
-        if [[ "$CC" != *clang* ]]; then
-            export CFLAGS="$CFLAGS -fpermissive -Wno-error=uninitialized -Wno-error=maybe-uninitialized"
-            export CXXFLAGS="$CXXFLAGS -fpermissive -Wno-error=uninitialized -Wno-error=maybe-uninitialized"
-        fi
+    if [[ $TARGET == *arm64 ]]; then
+    fixarm64=(
+        -DVVENC_ENABLE_X86_SIMD=OFF 
+        -DVVENC_ENABLE_ARM_SIMD=OFF
+    )
     fi
 
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DVVENC_ENABLE_LINK_TIME_OPT=OFF -DEXTRALIBS="-lstdc++" "${armsimd[@]}" ..