Move dirs to base image

streamlink · Sep 5, 2020 · 559b42c · 559b42c
1 parent b4878c4
commit 559b42c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/build.sh b/build.sh
@@ -44,10 +44,6 @@ docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash
     cd ffmpeg
     git checkout $GIT_BRANCH
 
-    export CFLAGS="\$CFLAGS -I\${FFBUILD_PREFIX}/include"
-    export CXXFLAGS="\$CXXFLAGS -I\${FFBUILD_PREFIX}/include"
-    export LDFLAGS="\$LDFLAGS -L\${FFBUILD_PREFIX}/lib"
-
     ./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS $FF_CONFIGURE --extra-cflags="$FF_CFLAGS" --extra-cxxflags="$FF_CXXFLAGS" --extra-ldflags="$FF_LDFLAGS"
     make -j\$(nproc)
     make install    

diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile
@@ -18,6 +18,6 @@ ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-ming
     FFBUILD_PREFIX=/opt/ffbuild \
     FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
     PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig \
-    CFLAGS="-static-libgcc -static-libstdc++" \
-    CXXFLAGS="-static-libgcc -static-libstdc++" \
-    LDFLAGS="-static-libgcc -static-libstdc++"
+    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include" \
+    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include" \
+    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib"