Skip to content

Commit 55530cf

Browse files
Update to newer MinGW target triplet
i686-pc-mingw32 has been replaced with i686-w64-mingw32. Signed-off-by: Anton Kolesov <[email protected]>
1 parent ae1859a commit 55530cf

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Makefile.release

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ build-all-windows.sh: build-all.sh | build-elf32-windows.sh $O/.stamp_source_tar
190190
$O/.stamp_elf_le_windows_built: $O/.stamp_checked_out build-all-windows.sh $O/.stamp_elf_le_built
191191
PATH=$(shell readlink -e $O/$(ELF_LE_DIR)/bin):$$PATH ./build-all-windows.sh $(BUILDALLFLAGS) \
192192
--install-dir $O/$(WIN_ELF_LE_DIR) --no-uclibc --no-sim --release-name $(RELEASE)
193-
cp -rfdv /usr/i686-pc-mingw32/sys-root/mingw/bin/* $O/$(WIN_ELF_LE_DIR)/bin
193+
# Copy some Windows dlls: libgcc_s_sjlj-1.dll, libssp-0.dll, libstdc++-6.dll
194+
# libwinpthread-1.dll
195+
cp -rfdv /usr/i686-w64-mingw32/sys-root/mingw/bin/* $O/$(WIN_ELF_LE_DIR)/bin
194196
touch $@
195197

196198
$O/.stamp_elf_be_windows_built: $O/.stamp_checked_out build-all-windows.sh $O/.stamp_elf_be_built

windows-installer/build-elf32_windows.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ index 3f5faab..f4a20b9 100755
66
--with-endian=${ARC_ENDIAN} ${DISABLEWERROR} \
77
--enable-languages=c,c++ --prefix=${INSTALLDIR} \
88
--with-headers="${config_path}"/newlib/libc/include \
9-
+ --host=i686-pc-mingw32 --build=x86_64-linux-gnu \
9+
+ --host=i686-w64-mingw32 --build=x86_64-linux-gnu \
1010
${sim_config} ${CONFIG_EXTRA} \
1111
>> "${log_path}" 2>&1
1212
then

0 commit comments

Comments
 (0)