diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-01-07 10:10:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-01-07 10:10:39 +0000 |
| commit | 17102d117aa6afa1b6d261fb6f49cf176921a681 (patch) | |
| tree | a60f54be479bd1699ff51cf4a094dcfc06a45a9f | |
| parent | f9bba0a50fafc7868630767a55cde9f5a16b8d76 (diff) | |
| download | busybox-w32-17102d117aa6afa1b6d261fb6f49cf176921a681.tar.gz busybox-w32-17102d117aa6afa1b6d261fb6f49cf176921a681.tar.bz2 busybox-w32-17102d117aa6afa1b6d261fb6f49cf176921a681.zip | |
Use MinGW-w64 by default
| -rw-r--r-- | archival/libarchive/decompress_gunzip.c | 2 | ||||
| -rw-r--r-- | archival/unzip.c | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 36 | #include <setjmp.h> | 36 | #include <setjmp.h> |
| 37 | #include "libbb.h" | 37 | #include "libbb.h" |
| 38 | #include "bb_archive.h" | 38 | #include "bb_archive.h" |
| 39 | #if ENABLE_PLATFORM_MINGW32 | 39 | #if ENABLE_PLATFORM_MINGW32 && __GNUC__ |
| 40 | #pragma pack(2) | 40 | #pragma pack(2) |
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
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 @@ | |||
| 44 | 44 | ||
| 45 | #include "libbb.h" | 45 | #include "libbb.h" |
| 46 | #include "bb_archive.h" | 46 | #include "bb_archive.h" |
| 47 | #if ENABLE_PLATFORM_MINGW32 | 47 | #if ENABLE_PLATFORM_MINGW32 && __GNUC__ |
| 48 | #pragma pack(2) | 48 | #pragma pack(2) |
| 49 | #endif | 49 | #endif |
| 50 | 50 | ||
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="" | |||
| 67 | # CONFIG_FEATURE_SHARED_BUSYBOX is not set | 67 | # CONFIG_FEATURE_SHARED_BUSYBOX is not set |
| 68 | CONFIG_LFS=y | 68 | CONFIG_LFS=y |
| 69 | CONFIG_NOGLOB=y | 69 | CONFIG_NOGLOB=y |
| 70 | CONFIG_CROSS_COMPILER_PREFIX="i686-pc-mingw32-" | 70 | CONFIG_CROSS_COMPILER_PREFIX="i686-w64-mingw32-" |
| 71 | CONFIG_SYSROOT="" | 71 | CONFIG_SYSROOT="" |
| 72 | CONFIG_EXTRA_CFLAGS="-g -O0" | 72 | CONFIG_EXTRA_CFLAGS="" |
| 73 | CONFIG_EXTRA_LDFLAGS="" | 73 | CONFIG_EXTRA_LDFLAGS="" |
| 74 | CONFIG_EXTRA_LDLIBS="" | 74 | CONFIG_EXTRA_LDLIBS="" |
| 75 | 75 | ||