[Xen-changelog] [xen-unstable] Allow .config to override the "cc_compile_by" and "cc_compile_domain" settings.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1209656218 -3600
# Node ID acdc1814d29b3ff05ea7093f06851edb31e06ad3
# Parent  706395167701dcb00e54d4739a163de944d70376
Allow .config to override the "cc_compile_by" and "cc_compile_domain" settings.

Signed-off-by: David Edmondson <dme@xxxxxxx>
---
 xen/Makefile |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 706395167701 -r acdc1814d29b xen/Makefile
--- a/xen/Makefile      Thu May 01 16:35:49 2008 +0100
+++ b/xen/Makefile      Thu May 01 16:36:58 2008 +0100
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog