john.levon@sun.com
2008-Apr-30 12:57 UTC
[Xen-devel] [PATCH] Allow .config to override the "cc_compile_by" and "cc_compile_domain"
# HG changeset patch # User john.levon@sun.com # Date 1209521786 25200 # Node ID 7ded40233ca3e57107b20023a8e5fc746452a6ee # Parent 45e7e8759469987ed600e6fc9f1523ba19409df4 Allow .config to override the "cc_compile_by" and "cc_compile_domain" settings. Signed-off-by: David Edmondson <dme@sun.com> diff --git a/xen/Makefile b/xen/Makefile --- a/xen/Makefile +++ b/xen/Makefile @@ -5,6 +5,9 @@ export XEN_EXTRAVERSION ?= -unstable$(XE export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version + +export XEN_WHOAMI ?= $(USER) +export XEN_DOMAIN ?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown])) export BASEDIR := $(CURDIR) @@ -81,8 +84,8 @@ include/xen/compile.h: include/xen/compi include/xen/compile.h: include/xen/compile.h.in .banner @sed -e ''s/@@date@@/$(shell LC_ALL=C date)/g'' \ -e ''s/@@time@@/$(shell LC_ALL=C date +%T)/g'' \ - -e ''s/@@whoami@@/$(USER)/g'' \ - -e ''s/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g'' \ + -e ''s/@@whoami@@/$(XEN_WHOAMI)/g'' \ + -e ''s/@@domain@@/$(XEN_DOMAIN)/g'' \ -e ''s/@@hostname@@/$(shell hostname)/g'' \ -e ''s!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep -i "gcc.*version")!g'' \ -e ''s/@@version@@/$(XEN_VERSION)/g'' \ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel