From bd3ab5db69ef03ebdb6683e8ffab97aee6080473 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 23 Sep 2011 11:42:49 +0100 Subject: [PATCH] Bug 1263 - waf configure fails on FreeBSD 9.0-BETA2 amd64 --- src/internet/wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/internet/wscript b/src/internet/wscript index 05d4c7ac3..5b02abfd4 100644 --- a/src/internet/wscript +++ b/src/internet/wscript @@ -53,17 +53,17 @@ def configure(conf): "NSC not found (see option --with-nsc)") return - if sys.platform in ['linux2']: + if Options.platform in ['linux', 'freebsd']: arch = os.uname()[4] else: arch = None ok = False - if arch in ('x86_64', 'i686', 'i586', 'i486', 'i386'): + if arch in ('amd64', 'x86_64', 'i686', 'i586', 'i486', 'i386'): conf.env['NSC_ENABLED'] = True conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE') conf.check_nonfatal(mandatory=True, lib='dl', define_name='HAVE_DL', uselib_store='DL') ok = True - conf.msg('Checking for NSC supported architecture ' + arch, ok) + conf.msg('Checking for NSC supported architecture ' + (arch or ''), ok) if not ok: conf.env['NSC_ENABLED'] = False