Added fortran compiler

* Added FC to all Dockerfiles * Changed cmake toolchains to use environment variables for compilers
2024-12-22 08:24:25 +01:00 · 2018-05-25 18:34:20 +02:00 · 2018-05-25 18:34:20 +02:00 · eb65a8970a
commit eb65a8970a
parent 9cc9ae7977
27 changed files with 76 additions and 57 deletions
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@ -14,7 +14,8 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

 ENV ANDROID_NDK_REVISION 16b
 ENV ANDROID_NDK_API 16
--- a/android-arm/Toolchain.cmake
+++ b/android-arm/Toolchain.cmake
@ -2,17 +2,18 @@ set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)

 set(cross_triple arm-linux-androideabi)
-set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN /usr/${cross_triple}/)
+set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE 1)
 set(CMAKE_ANDROID_ARM_NEON 1)

-set(CMAKE_C_COMPILER /usr/${cross_triple}/bin/${cross_triple}-clang)
-set(CMAKE_CXX_COMPILER /usr/${cross_triple}/bin/${cross_triple}-clang++)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

-set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple})
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_SYSROOT /usr/${cross_triple}/sysroot)
+set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)

 set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
--- a/android-arm64/Dockerfile
+++ b/android-arm64/Dockerfile
@ -15,7 +15,8 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

 ENV ANDROID_NDK_REVISION 16b
 ENV ANDROID_NDK_API 21
--- a/android-arm64/Toolchain.cmake
+++ b/android-arm64/Toolchain.cmake
@ -2,18 +2,19 @@ set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)

 set(cross_triple aarch64-linux-android)
-set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN /usr/${cross_triple}/)
+set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE 1)
 set(CMAKE_ANDROID_ARM_NEON 1)

-set(CMAKE_C_COMPILER /usr/${cross_triple}/bin/${cross_triple}-clang)
-set(CMAKE_CXX_COMPILER /usr/${cross_triple}/bin/${cross_triple}-clang++)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

-set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple})
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_SYSROOT /usr/${cross_triple}/sysroot)
+set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)

 set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)

--- a/linux-arm64/Dockerfile.in
+++ b/linux-arm64/Dockerfile.in
@ -31,7 +31,8 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-as \
    CC=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-cpp \
    CXX=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}/bin/${CROSS_TRIPLE}-gfortran

 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64
 WORKDIR /work
--- a/linux-arm64/Toolchain.cmake
+++ b/linux-arm64/Toolchain.cmake
@ -5,11 +5,11 @@ set(CMAKE_SYSTEM_PROCESSOR aarch64)

 set(cross_triple "aarch64-unknown-linux-gnueabi")

-set(CMAKE_C_COMPILER /usr/bin/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-cc)
-set(CMAKE_CXX_COMPILER /usr/bin/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-c++)
-set(CMAKE_Fortran_COMPILER /usr/bin/aarch64-unknown-linux-gnueabi/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

-set(CMAKE_FIND_ROOT_PATH /usr/bin/aarch64-unknown-linux-gnueabi)
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/linux-armv5/Dockerfile
+++ b/linux-armv5/Dockerfile
@ -23,7 +23,8 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/bin/${CROSS_TRIPLE}-cpp-4.9 \
    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

 ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
 ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
--- a/linux-armv5/Toolchain.cmake
+++ b/linux-armv5/Toolchain.cmake
@ -4,11 +4,11 @@ set(CMAKE_SYSTEM_PROCESSOR arm)

 set(cross_triple "arm-linux-gnueabi")

-set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-g++)
-set(CMAKE_Fortran_COMPILER /usr/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

-set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple} /usr/${cross_triple}/libc/usr)
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT} $ENV{CROSS_ROOT}/libc/usr)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/linux-armv6/Dockerfile
+++ b/linux-armv6/Dockerfile
@ -18,7 +18,8 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/bin/${CROSS_TRIPLE}-cpp \
    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

 # Raspberry Pi is ARMv6+VFP2, Debian armhf is ARMv7+VFP3
 # Since this Dockerfile is targeting linux-arm from Raspberry Pi onward,
--- a/linux-armv6/Toolchain.cmake
+++ b/linux-armv6/Toolchain.cmake
@ -4,11 +4,11 @@ set(CMAKE_SYSTEM_PROCESSOR arm)

 set(cross_triple "arm-linux-gnueabihf")

-set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-g++)
-set(CMAKE_Fortran_COMPILER /usr/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

-set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple} /usr/${cross_triple}/libc/usr)
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT} $ENV{CROSS_ROOT}/libc/usr)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/linux-armv7/Dockerfile
+++ b/linux-armv7/Dockerfile
@ -23,7 +23,8 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/bin/${CROSS_TRIPLE}-cpp-4.9 \
    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv7

--- a/linux-armv7/Toolchain.cmake
+++ b/linux-armv7/Toolchain.cmake
@ -4,9 +4,9 @@ set(CMAKE_SYSTEM_PROCESSOR arm)

 set(cross_triple "arm-linux-gnueabihf")

-set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-cc)
-set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-c++)
-set(CMAKE_Fortran_COMPILER /usr/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

 # Discard path returned by pkg-config and associated with HINTS in module
 # like FindOpenSSL.
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@ -20,7 +20,8 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

 ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
 ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
--- a/linux-mips/Toolchain.cmake
+++ b/linux-mips/Toolchain.cmake
@ -5,9 +5,9 @@ set(CMAKE_SYSTEM_PROCESSOR mips)
 set(cross_triple "mips-unknown-linux-gnu")
 set(cross_root /usr/xcc/${cross_triple})

-set(CMAKE_C_COMPILER ${cross_root}/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER ${cross_root}/bin/${cross_triple}-g++)
-set(CMAKE_Fortran_COMPILER ${cross_root}/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_FIND_ROOT_PATH ${cross_root}/lib ${cross_root}/${cross_triple}/lib)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
--- a/linux-mipsel/Dockerfile
+++ b/linux-mipsel/Dockerfile
@ -23,7 +23,8 @@ ENV AS=${CROSS_ROOT}/${CROSS_TRIPLE}-as \
    CC=${CROSS_ROOT}/${CROSS_TRIPLE}-gcc \
    CPP=${CROSS_ROOT}/${CROSS_TRIPLE}-cpp-4.9 \
    CXX=${CROSS_ROOT}/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/${CROSS_TRIPLE}-ld
+    LD=${CROSS_ROOT}/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/${CROSS_TRIPLE}-gfortran

 ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
 ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
--- a/linux-mipsel/Toolchain.cmake
+++ b/linux-mipsel/Toolchain.cmake
@ -4,11 +4,11 @@ set(CMAKE_SYSTEM_PROCESSOR mipsel)

 set(cross_triple "mipsel-linux-gnu")

-set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-g++)
-set(CMAKE_Fortran_COMPILER /usr/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

-set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple} /usr/${cross_triple}/libc/usr)
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT} $ENV{CROSS_ROOT}/libc/usr)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/linux-ppc64le/Dockerfile
+++ b/linux-ppc64le/Dockerfile
@ -32,7 +32,8 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/bin/${CROSS_TRIPLE}-cpp \
    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-ppc64le
 WORKDIR /work
--- a/linux-ppc64le/Toolchain.cmake
+++ b/linux-ppc64le/Toolchain.cmake
@ -4,9 +4,9 @@ set(CMAKE_SYSTEM_PROCESSOR ppc64le)

 set(cross_triple "powerpc64le-linux-gnu")

-set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-cc)
-set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-c++)
-set(CMAKE_Fortran_COMPILER /usr/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

 # Discard path returned by pkg-config and associated with HINTS in module
 # like FindOpenSSL.
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@ -20,7 +20,8 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

 ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
 ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
--- a/linux-s390x/Toolchain.cmake
+++ b/linux-s390x/Toolchain.cmake
@ -5,9 +5,9 @@ set(CMAKE_SYSTEM_PROCESSOR s390x)
 set(cross_triple "s390x-ibm-linux-gnu")
 set(cross_root /usr/xcc/${cross_triple})

-set(CMAKE_C_COMPILER ${cross_root}/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER ${cross_root}/bin/${cross_triple}-g++)
-set(CMAKE_Fortran_COMPILER ${cross_root}/bin/${cross_triple}-gfortran)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_FIND_ROOT_PATH ${cross_root}/lib ${cross_root}/${cross_triple}/lib)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
--- a/linux-x64/Dockerfile
+++ b/linux-x64/Dockerfile
@ -8,7 +8,8 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/bin/${CROSS_TRIPLE}-cpp \
    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

 COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

--- a/linux-x64/Toolchain.cmake
+++ b/linux-x64/Toolchain.cmake
@ -4,8 +4,9 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)

 set(cross_triple "x86_64-linux-gnu")

-set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-g++)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})

 set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)
--- a/linux-x86/Toolchain.cmake
+++ b/linux-x86/Toolchain.cmake
@ -9,8 +9,9 @@ set(CMAKE_SYSTEM_PROCESSOR i686)

 set(cross_triple "i686-linux-gnu")

-set(CMAKE_C_COMPILER /usr/${cross_triple}/bin/${cross_triple}-gcc)
-set(CMAKE_CXX_COMPILER /usr/${cross_triple}/bin/${cross_triple}-g++)
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})

 # Discard path returned by pkg-config and associated with HINTS in module
--- a/manylinux-x64/Dockerfile.in
+++ b/manylinux-x64/Dockerfile.in
@ -14,7 +14,8 @@ ENV AS=${CROSS_ROOT}/as \
    CC=${CROSS_ROOT}/gcc \
    CPP=${CROSS_ROOT}/cpp \
    CXX=${CROSS_ROOT}/g++ \
-    LD=${CROSS_ROOT}/ld
+    LD=${CROSS_ROOT}/ld \
+    FC=${CROSS_ROOT}/gfortran

 COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

--- a/manylinux-x86/Dockerfile.in
+++ b/manylinux-x86/Dockerfile.in
@ -14,7 +14,8 @@ ENV AS=${CROSS_ROOT}/as \
    CC=${CROSS_ROOT}/gcc \
    CPP=${CROSS_ROOT}/cpp \
    CXX=${CROSS_ROOT}/g++ \
-    LD=${CROSS_ROOT}/ld
+    LD=${CROSS_ROOT}/ld \
+    FC=${CROSS_ROOT}/gfortran

 COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

--- a/windows-x64/Dockerfile
+++ b/windows-x64/Dockerfile
@ -63,7 +63,8 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-cpp \
    CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gfortran

 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x64
 WORKDIR /work
--- a/windows-x86/Dockerfile
+++ b/windows-x86/Dockerfile
@ -63,7 +63,8 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
    CC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gcc \
    CPP=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-cpp \
    CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
+    LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gfortran

 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86
 WORKDIR /work