diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /Makefile.flags | |
parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'Makefile.flags')
-rw-r--r-- | Makefile.flags | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.flags b/Makefile.flags index 513b6ebb2..b653d55c1 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
@@ -99,13 +99,18 @@ endif | |||
99 | 99 | ||
100 | ifeq ($(CONFIG_PLATFORM_MINGW32),y) | 100 | ifeq ($(CONFIG_PLATFORM_MINGW32),y) |
101 | # These defintions are not strictly needed, but they help shut up fnmatch.c warnings | 101 | # These defintions are not strictly needed, but they help shut up fnmatch.c warnings |
102 | CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 | 102 | CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy |
103 | EXEEXT = .exe | 103 | EXEEXT = .exe |
104 | ifeq ($(CONFIG_WIN32_NET),y) | 104 | ifeq ($(CONFIG_WIN32_NET),y) |
105 | LDLIBS += ws2_32 | 105 | LDLIBS += ws2_32 |
106 | endif | 106 | endif |
107 | else | 107 | else |
108 | ifneq ($(CONFIG_CROSS_COMPILER_PREFIX),"arm-linux-androideabi-") | ||
108 | LDLIBS += m crypt | 109 | LDLIBS += m crypt |
110 | else | ||
111 | # Android libc has no crypt. TODO: make a generic CONFIG_LINK_WITH_CRYPT option? | ||
112 | LDLIBS += m | ||
113 | endif | ||
109 | endif | 114 | endif |
110 | 115 | ||
111 | ifeq ($(CONFIG_PAM),y) | 116 | ifeq ($(CONFIG_PAM),y) |