Switch all base images to ct-ng based toolchains
This commit is contained in:
parent
71994e145a
commit
bdf1cc507a
9 changed files with 1509 additions and 27 deletions
|
@ -14,8 +14,4 @@ ffbuild_dockerbuild() {
|
|||
|
||||
mkdir -p "$FFBUILD_PREFIX"/include
|
||||
cp *.h "$FFBUILD_PREFIX"/include
|
||||
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
|
||||
-DMINGW_STDTHREADS_DIR="$FFBUILD_PREFIX"/include -DMINGW_STDTHREADS_BUILD_TEST=0 -DMINGW_STDTHREADS_GENERATE_STDHEADERS=1 .
|
||||
cp cmake_stdheaders_generator/cmake_stdheaders_generator/* "$FFBUILD_PREFIX"/include
|
||||
}
|
||||
|
|
|
@ -28,8 +28,10 @@ ffbuild_dockerbuild() {
|
|||
unset LDFLAGS
|
||||
unset PKG_CONFIG_LIBDIR
|
||||
|
||||
GCC_SYSROOT="$(${FFBUILD_CROSS_PREFIX}gcc -print-sysroot)"
|
||||
|
||||
local myconf=(
|
||||
--prefix="/usr/$FFBUILD_TOOLCHAIN"
|
||||
--prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN"
|
||||
--host="$FFBUILD_TOOLCHAIN"
|
||||
--with-default-win32-winnt="0x601"
|
||||
--enable-idl
|
||||
|
@ -42,7 +44,7 @@ ffbuild_dockerbuild() {
|
|||
cd ../mingw-w64-libraries/winpthreads
|
||||
|
||||
local myconf=(
|
||||
--prefix="/usr/$FFBUILD_TOOLCHAIN"
|
||||
--prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN"
|
||||
--host="$FFBUILD_TOOLCHAIN"
|
||||
--with-pic
|
||||
--disable-shared
|
||||
|
|
|
@ -23,6 +23,7 @@ ffbuild_dockerbuild() {
|
|||
--prefix="$FFBUILD_PREFIX"
|
||||
--disable-shared
|
||||
--enable-static
|
||||
--disable-fortran
|
||||
--disable-doc
|
||||
--with-our-malloc
|
||||
--enable-threads
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue