diff options
author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /Makefile.flags | |
parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
download | busybox-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.flags | 5 |
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 | |||
59 | CFLAGS += $(call cc-option,-fno-guess-branch-probability,) | 59 | CFLAGS += $(call cc-option,-fno-guess-branch-probability,) |
60 | CFLAGS += $(call cc-option,-funsigned-char,) | 60 | CFLAGS += $(call cc-option,-funsigned-char,) |
61 | 61 | ||
62 | ifneq ($(CC),clang) | 62 | ifeq ($(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'" |
64 | CFLAGS += $(call cc-option,-static-libgcc,) | 65 | CFLAGS += $(call cc-option,-static-libgcc,) |
65 | endif | 66 | endif |
@@ -189,8 +190,10 @@ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=% | |||
189 | endif | 190 | endif |
190 | 191 | ||
191 | ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y) | 192 | ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y) |
193 | ifeq ($(CONFIG_UNAME_OSNAME),Linux) | ||
192 | LDLIBS += resolv | 194 | LDLIBS += resolv |
193 | endif | 195 | endif |
196 | endif | ||
194 | 197 | ||
195 | ifeq ($(CONFIG_EFENCE),y) | 198 | ifeq ($(CONFIG_EFENCE),y) |
196 | LDLIBS += efence | 199 | LDLIBS += efence |