summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-05-07 09:00:53 +0200
committerAndrew Tridgell <tridge@samba.org>2010-05-07 09:03:47 +0200
commit815fcfba48ecf2596d989c646cd59c305b0d38ef (patch)
tree8ddf65e13c6a8a43b5a9bb3ac1314c54232bd0f3 /buildtools
parent1c7a60ef41d76526384d6b9e4ba03d3df251fe06 (diff)
downloadsamba-815fcfba48ecf2596d989c646cd59c305b0d38ef.tar.gz
samba-815fcfba48ecf2596d989c646cd59c305b0d38ef.tar.bz2
samba-815fcfba48ecf2596d989c646cd59c305b0d38ef.zip
build: treat a blank --build or --host as not a cross-compile
This matches autoconf behaviour
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/wscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index c8872eb795..56f2e60a5b 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -178,7 +178,9 @@ def configure(conf):
conf.env.AUTOCONF_HOST = Options.options.AUTOCONF_HOST
conf.env.AUTOCONF_PROGRAM_PREFIX = Options.options.AUTOCONF_PROGRAM_PREFIX
- if conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST:
+ if (conf.env.AUTOCONF_HOST and
+ conf.env.AUTOCONF_BUILD and
+ conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST):
Logs.error('ERROR: Mismatch between --build and --host. Please use --cross-compile instead')
sys.exit(1)
if conf.env.AUTOCONF_PROGRAM_PREFIX: