aboutsummaryrefslogtreecommitdiff
path: root/Makefile.flags
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-01-14 13:28:49 +0000
committerRon Yorston <rmy@pobox.com>2021-01-14 13:28:49 +0000
commit89963b524d211e1aec12b72b3725be05ee95c8cf (patch)
tree48590aef62b7ee7686b7898256f29def8d9c50b9 /Makefile.flags
parent9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff)
parent2b7c1aa92c68524559a2067609d09309d5c09adc (diff)
downloadbusybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz
busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2
busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'Makefile.flags')
-rw-r--r--Makefile.flags5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.flags b/Makefile.flags
index fdaf5cc79..94ed4e40e 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -59,7 +59,8 @@ CFLAGS += $(call cc-option,-fno-builtin-strlen -fomit-frame-pointer -ffunction-s
59CFLAGS += $(call cc-option,-fno-guess-branch-probability,) 59CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
60CFLAGS += $(call cc-option,-funsigned-char,) 60CFLAGS += $(call cc-option,-funsigned-char,)
61 61
62ifneq ($(CC),clang) 62ifeq ($(CONFIG_STATIC_LIBGCC),y)
63# Disable it, for example, if you get
63# "clang-9: warning: argument unused during compilation: '-static-libgcc'" 64# "clang-9: warning: argument unused during compilation: '-static-libgcc'"
64CFLAGS += $(call cc-option,-static-libgcc,) 65CFLAGS += $(call cc-option,-static-libgcc,)
65endif 66endif
@@ -189,8 +190,10 @@ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%
189endif 190endif
190 191
191ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y) 192ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
193ifeq ($(CONFIG_UNAME_OSNAME),Linux)
192LDLIBS += resolv 194LDLIBS += resolv
193endif 195endif
196endif
194 197
195ifeq ($(CONFIG_EFENCE),y) 198ifeq ($(CONFIG_EFENCE),y)
196LDLIBS += efence 199LDLIBS += efence