aboutsummaryrefslogtreecommitdiff
path: root/Makefile.flags
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-23 11:13:23 +0000
committerRon Yorston <rmy@pobox.com>2012-03-23 11:13:23 +0000
commit40514a0309939f2446f0d4ed9600cad5de396e7f (patch)
tree0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /Makefile.flags
parent9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff)
parentc0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff)
downloadbusybox-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.flags7
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
100ifeq ($(CONFIG_PLATFORM_MINGW32),y) 100ifeq ($(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
102CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 102CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy
103EXEEXT = .exe 103EXEEXT = .exe
104ifeq ($(CONFIG_WIN32_NET),y) 104ifeq ($(CONFIG_WIN32_NET),y)
105LDLIBS += ws2_32 105LDLIBS += ws2_32
106endif 106endif
107else 107else
108ifneq ($(CONFIG_CROSS_COMPILER_PREFIX),"arm-linux-androideabi-")
108LDLIBS += m crypt 109LDLIBS += m crypt
110else
111# Android libc has no crypt. TODO: make a generic CONFIG_LINK_WITH_CRYPT option?
112LDLIBS += m
113endif
109endif 114endif
110 115
111ifeq ($(CONFIG_PAM),y) 116ifeq ($(CONFIG_PAM),y)