diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index e7531ae..1263beb 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -21,11 +21,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index 1548ef9..8a701f0 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -19,11 +19,11 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh
index c39c656..84c073e 100755
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@@ -20,10 +20,10 @@ ffbuild_dockerbuild() {
         --static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         export CC="${FFBUILD_CROSS_PREFIX}gcc"
         export AR="${FFBUILD_CROSS_PREFIX}ar"
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index d40cb10..d441043 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -33,11 +33,11 @@ ffbuild_dockerbuild() {
         --enable-avx2
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 82328c4..a58c53e 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -21,11 +21,11 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index cf5df61..dbf4ae3 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -22,11 +22,11 @@ ffbuild_dockerbuild() {
         -Dtests=false
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --cross-file=/cross.meson
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 3af368f..a586c34 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index 1f5c196..3287dff 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 801bbeb..e5705b1 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -33,6 +33,7 @@ ffbuild_dockerbuild() {
         )
     elif [[ $TARGET == linux64 ]]; then
         myconf+=(
+            --cross-compile-prefix="$FFBUILD_CROSS_PREFIX"
             linux-x86_64
         )
     else
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index a81da03..62c13f2 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -22,11 +22,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index af06ea2..6b0843a 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -24,11 +24,11 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
@@ -36,10 +36,6 @@ ffbuild_dockerbuild() {
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
-
-    if [[ $TARGET == linux* ]]; then
-        sed -i 's/Libs.private:/Libs.private: -lintl/' "$FFBUILD_PREFIX"/lib/pkgconfig/fontconfig.pc
-    fi
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 4c94749..fe5a5d6 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -18,11 +18,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh
index f454966..78fe3bd 100755
--- a/scripts.d/45-libudfread.sh
+++ b/scripts.d/45-libudfread.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh
index 37c8ebb..849438b 100755
--- a/scripts.d/45-libvorbis.sh
+++ b/scripts.d/45-libvorbis.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --disable-oggtest
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index e902cdc..91c922f 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -35,9 +35,14 @@ ffbuild_dockerbuild() {
     echo "Description: OpenCL ICD Loader" >> OpenCL.pc
     echo "Version: 9999" >> OpenCL.pc
     echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc
-    echo "Libs.private: -lole32 -lshlwapi -lcfgmgr32" >> OpenCL.pc
     echo "Cflags: -I\${includedir}" >> OpenCL.pc
 
+    if [[ $TARGET == linux* ]]; then
+        echo "Libs.private: -ldl" >> OpenCL.pc
+    elif [[ $TARGET == win* ]]; then
+        echo "Libs.private: -lole32 -lshlwapi -lcfgmgr32" >> OpenCL.pc
+    fi
+
     mkdir -p "$FFBUILD_PREFIX"/lib/pkgconfig
     mv OpenCL.pc "$FFBUILD_PREFIX"/lib/pkgconfig/OpenCL.pc
 }
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 133c661..b0acbd0 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -27,11 +27,11 @@ ffbuild_dockerbuild() {
         -Denable_float=true
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --cross-file=/cross.meson
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index d1682ff..036ba6c 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -19,11 +19,11 @@ ffbuild_dockerbuild() {
         --default-library=static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --cross-file=/cross.meson
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index f36f5a9..6405e3f 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -21,12 +21,12 @@ ffbuild_dockerbuild() {
         --prefix="$FFBUILD_PREFIX"
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
             --cross-prefix="$FFBUILD_CROSS_PREFIX"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index f83d7ad..73b55f9 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 05b584d..8f3d4c0 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -27,11 +27,11 @@ ffbuild_dockerbuild() {
         --disable-bdjava-jar
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index e7d730c..eb6a4b7 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -24,11 +24,11 @@ ffbuild_dockerbuild() {
         --disable-frontend
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 7d16052..30c14ae 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --disable-extra-programs
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh
index 4c27321..d922288 100755
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@@ -25,11 +25,11 @@ ffbuild_dockerbuild() {
         --disable-doc
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index 435c558..3d650b6 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -32,7 +32,12 @@ ffbuild_dockerbuild() {
             --target=x86-win32-gcc
         )
         export CROSS="$FFBUILD_CROSS_PREFIX"
-    elif [[ $TARGET != linux* ]]; then
+    elif [[ $TARGET == linux* ]]; then
+        myconf+=(
+            --target=x86_64-linux-gcc
+        )
+        export CROSS="$FFBUILD_CROSS_PREFIX"
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index ad1ac59..d1986ed 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -29,11 +29,11 @@ ffbuild_dockerbuild() {
         --disable-gif
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 1d056fd..fa924c3 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh
index e43a111..b55bd22 100755
--- a/scripts.d/50-opencore-amr.sh
+++ b/scripts.d/50-opencore-amr.sh
@@ -26,11 +26,11 @@ ffbuild_dockerbuild() {
         --disable-examples
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 38cbece..9463fb2 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -27,11 +27,11 @@ ffbuild_dockerbuild() {
         -Dno_shared=true
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --cross-file=/cross.meson
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 6445ac4..20b70b9 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -23,11 +23,11 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh
index 83ad6a0..c170aa9 100755
--- a/scripts.d/50-soxr.sh
+++ b/scripts.d/50-soxr.sh
@@ -14,15 +14,11 @@ ffbuild_dockerbuild() {
 
     mkdir build && cd build
 
-    if [[ $VARIANT == *shared* && $TARGET == linux* ]]; then
-       USE_OMP="OFF"
-    else
-       USE_OMP="ON"
-    fi
-
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DWITH_OPENMP="$USE_OMP" -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DWITH_OPENMP=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
     make -j$(nproc)
     make install
+
+    echo "Libs.private: -lgomp" >> "$FFBUILD_PREFIX"/lib/pkgconfig/soxr.pc
 }
 
 ffbuild_configure() {
@@ -33,10 +29,6 @@ ffbuild_unconfigure() {
     echo --disable-libsoxr
 }
 
-ffbuild_ldflags() {
-    echo -pthread
-}
-
 ffbuild_libs() {
-    [[ $VARIANT == *shared* && $TARGET == linux* ]] || echo -lgomp
+    echo -lgomp
 }
diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh
index 69d6e6c..6464678 100755
--- a/scripts.d/50-twolame.sh
+++ b/scripts.d/50-twolame.sh
@@ -22,11 +22,11 @@ ffbuild_dockerbuild() {
         --disable-sndfile
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 8106cd3..edd73f0 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -15,15 +15,13 @@ ffbuild_dockerbuild() {
 
     mkdir build && cd build
 
-    if [[ $VARIANT == *shared* && $TARGET == linux* ]]; then
-       USE_OMP="OFF"
-    else
-       USE_OMP="ON"
-    fi
-
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DUSE_OMP="$USE_OMP" ..
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DUSE_OMP=ON ..
     make -j$(nproc)
     make install
+
+    if [[ $TARGET == linux* ]]; then
+        echo "Libs.private: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/vidstab.pc
+    fi
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index e12b15e..004d8d3 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -21,12 +21,12 @@ ffbuild_dockerbuild() {
         --prefix="$FFBUILD_PREFIX"
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
             --cross-prefix="$FFBUILD_CROSS_PREFIX"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index 60ca67d..f8f3c02 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -29,12 +29,12 @@ ffbuild_dockerbuild() {
         --prefix="$FFBUILD_PREFIX"
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
             --cross-prefix="$FFBUILD_CROSS_PREFIX"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index 233f0b0..9b70234 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -29,11 +29,11 @@ ffbuild_dockerbuild() {
         --prefix="$FFBUILD_PREFIX"
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 4a17906..1e198d0 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -20,11 +20,11 @@ ffbuild_dockerbuild() {
         --with-pic
     )
 
-    if [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )
-    elif [[ $TARGET != linux* ]]; then
+    else
         echo "Unknown target"
         return -1
     fi
diff --git a/scripts.d/99-staticify.sh b/scripts.d/99-staticify.sh
deleted file mode 100755
index 30f6163..0000000
--- a/scripts.d/99-staticify.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-ffbuild_enabled() {
-    [[ $TARGET == linux* ]]
-}
-
-ffbuild_dockerfinal() {
-    to_df "RUN find /lib /usr/lib -maxdepth 1 -and -type l -and -name '*.so' -delete"
-}
-
-ffbuild_dockerlayer() {
-    return 0
-}
-
-ffbuild_dockerstage() {
-    return 0
-}
-
-ffbuild_dockerbuild() {
-    return 0
-}
-
-ffbuild_ldflags() {
-    if [[ $VARIANT != *shared* ]]; then
-        echo "-pie -fPIE -static"
-    fi
-}
-
-ffbuild_configure() {
-    if [[ $VARIANT == *shared* ]]; then
-        # Can't escape hell
-        echo --extra-ldexeflags=\'-Wl,-rpath='\\\\\\\$\\\$ORIGIN'\\ -Wl,-rpath='\\\\\\\$\\\$ORIGIN/../lib'\'
-    fi
-}