From 17102d117aa6afa1b6d261fb6f49cf176921a681 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 7 Jan 2015 10:10:39 +0000 Subject: Use MinGW-w64 by default --- archival/libarchive/decompress_gunzip.c | 2 +- archival/unzip.c | 2 +- configs/mingw32_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c index 2dcc138f9..dced609e5 100644 --- a/archival/libarchive/decompress_gunzip.c +++ b/archival/libarchive/decompress_gunzip.c @@ -36,7 +36,7 @@ #include #include "libbb.h" #include "bb_archive.h" -#if ENABLE_PLATFORM_MINGW32 +#if ENABLE_PLATFORM_MINGW32 && __GNUC__ #pragma pack(2) #endif diff --git a/archival/unzip.c b/archival/unzip.c index 9b6ceb25f..1ef026a9f 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -44,7 +44,7 @@ #include "libbb.h" #include "bb_archive.h" -#if ENABLE_PLATFORM_MINGW32 +#if ENABLE_PLATFORM_MINGW32 && __GNUC__ #pragma pack(2) #endif diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 8dfc4227b..4a3303b9e 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -67,9 +67,9 @@ CONFIG_BUSYBOX_EXEC_PATH="" # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y CONFIG_NOGLOB=y -CONFIG_CROSS_COMPILER_PREFIX="i686-pc-mingw32-" +CONFIG_CROSS_COMPILER_PREFIX="i686-w64-mingw32-" CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="-g -O0" +CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" -- cgit v1.2.3-55-g6feb