projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (...
[openwrt.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index 0a958c2d58688f3894835cb4da95ff619ce51bf1..6fbf88f801f21113335ed2e733670d966479d447 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-5,7
+5,9
@@
# See /LICENSE for more information.
#
# See /LICENSE for more information.
#
--include $(TOPDIR)/.config
+ifeq ($(DUMP),)
+ -include $(TOPDIR)/.config
+endif
include $(TOPDIR)/include/verbose.mk
export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
include $(TOPDIR)/include/verbose.mk
export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
@@
-70,6
+72,7
@@
ifneq ($(CONFIG_CCACHE),)
endif
EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
endif
EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS := $(EXTRA_CPPFLAGS)
EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
TARGET_CONFIGURE_OPTS:= \
EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
TARGET_CONFIGURE_OPTS:= \
@@
-82,10
+85,13
@@
TARGET_CONFIGURE_OPTS:= \
CXX=$(TARGET_CROSS)g++ \
RANLIB=$(TARGET_CROSS)ranlib \
STRIP=$(TARGET_CROSS)strip \
CXX=$(TARGET_CROSS)g++ \
RANLIB=$(TARGET_CROSS)ranlib \
STRIP=$(TARGET_CROSS)strip \
- OBJCOPY=$(TARGET_CROSS)objcopy
+ OBJCOPY=$(TARGET_CROSS)objcopy \
+ OBJDUMP=$(TARGET_CROSS)objdump \
+ SIZE=$(TARGET_CROSS)size
# strip an entire directory
RSTRIP:= \
# strip an entire directory
RSTRIP:= \
+ NM="$(TARGET_CROSS)nm" \
STRIP="$(STRIP)" \
STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
$(SCRIPT_DIR)/rstrip.sh
STRIP="$(STRIP)" \
STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
$(SCRIPT_DIR)/rstrip.sh
@@
-128,7
+134,6
@@
$(call shvar,$(1))=$$(call $(1))
export $(call shvar,$(1))
endef
export $(call shvar,$(1))
endef
-
all:
FORCE: ;
.PHONY: FORCE
all:
FORCE: ;
.PHONY: FORCE