diff options
| -rw-r--r-- | Config.mk | 2 | ||||
| -rw-r--r-- | buildconfigs/Rules.mk | 4 | ||||
| -rw-r--r-- | config/Linux.mk | 2 | ||||
| -rw-r--r-- | config/SunOS.mk | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -24,7 +24,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR) endif -test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2)) +test-gcc-flag = $(shell $(1) -v --help 2>&1 | $(GREP) -q " $(2) " && echo $(2)) ifneq ($(debug),y) CFLAGS += -DNDEBUG diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index ae61ea0095..9e64c5a5eb 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -22,7 +22,7 @@ endif # Expand Linux series to Linux version LINUX_SERIES ?= 2.6 -LINUX_VER ?= $(shell grep "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//') +LINUX_VER ?= $(shell $(GREP) "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//') # Setup Linux search path LINUX_SRC_PATH ?= .:.. @@ -125,7 +125,7 @@ config-update-pae: ifeq ($(XEN_TARGET_X86_PAE),y) sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) else - grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true + $(GREP) '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true endif # never delete any intermediate files. diff --git a/config/Linux.mk b/config/Linux.mk index 0e00d5520e..fc434b2a35 100644 --- a/config/Linux.mk +++ b/config/Linux.mk @@ -11,6 +11,8 @@ STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +GREP = grep + INSTALL = install INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 diff --git a/config/SunOS.mk b/config/SunOS.mk index 9acfc03c5d..0386ca2cbd 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -11,6 +11,8 @@ STRIP = $(CROSS_COMPILE)gstrip OBJCOPY = $(CROSS_COMPILE)gobjcopy OBJDUMP = $(CROSS_COMPILE)gobjdump +GREP = ggrep + INSTALL = ginstall INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 |