fix build in netbsd

cross-rs · Mar 21, 2024 · 98942fd · 98942fd
1 parent 758d7a4
commit 98942fd
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/docker/netbsd.sh b/docker/netbsd.sh
@@ -38,8 +38,9 @@ main() {
     sed -i -e 's/ftp:/https:/g' ./contrib/download_prerequisites
     ./contrib/download_prerequisites
     local patches=(
-        https://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/lang/gcc9/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
         https://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/lang/gcc9/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc
+        https://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/lang/gcc9/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
+        https://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/lang/gcc8/patches/patch-libgfortran_io_io.h
     )
 
     local patch
@@ -92,7 +93,8 @@ main() {
     ln -s libutil.so.7.24 "${destdir}/lib/libutil.so.7"
 
     pushd gcc-build
-    ../gcc/configure \
+    # remove the environment variables after bumping the gcc version to 11.
+    target_configargs="ac_cv_func_newlocale=no ac_cv_func_freelocale=no ac_cv_func_uselocale=no" ../gcc/configure \
         --disable-libada \
         --disable-libcilkrt \
         --disable-libcilkrts \