From b7ff07fa268edf684eb97025958cb7b1acf1fe9f Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Wed, 10 Mar 2010 07:25:02 -0500 Subject: Fix error message. This is liblitmus, not ft_tools. --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index f22facb..8a40ace 100644 --- a/SConstruct +++ b/SConstruct @@ -51,7 +51,7 @@ elif 'ARCH' in environ: arch = environ['ARCH'] if arch not in SUPPORTED_ARCHS: - print 'Error: Building ft_tools is only supported for the following', \ + print 'Error: Building liblitmus is only supported for the following', \ 'architectures: %s.' % ', '.join(sorted(SUPPORTED_ARCHS)) Exit(1) else: -- cgit v1.2.2 From 2db24e6471f4947f1779fb72109cadd9a62366f3 Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Wed, 10 Mar 2010 07:26:41 -0500 Subject: Build fix: support building on i686 systems 32bit Intel systems don't actually report 'x86' as their architecture, rather, they are i?86 systems. Provide a lookup table to map these codes to the 'x86' name that is used in the SConstruct file. --- SConstruct | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/SConstruct b/SConstruct index 8a40ace..e7885d3 100644 --- a/SConstruct +++ b/SConstruct @@ -9,12 +9,17 @@ API_FLAGS = '-D_XOPEN_SOURCE=600 -D_GNU_SOURCE' X86_32_FLAGS = '-m32' X86_64_FLAGS = '-m64' V9_FLAGS = '-mcpu=v9 -m64' + SUPPORTED_ARCHS = { 'sparc64' : V9_FLAGS, 'x86' : X86_32_FLAGS, 'x86_64' : X86_64_FLAGS, } +ARCH_ALIAS = { + 'i686' : 'x86' +} + KERNEL_INCLUDE = '%s/include/' % LITMUS_KERNEL INCLUDE_DIRS = 'include/ ' + KERNEL_INCLUDE @@ -50,6 +55,10 @@ if 'ARCH' in ARGUMENTS: elif 'ARCH' in environ: arch = environ['ARCH'] +# replace if the arch has an alternative name +if arch in ARCH_ALIAS: + arch = ARCH_ALIAS[arch] + if arch not in SUPPORTED_ARCHS: print 'Error: Building liblitmus is only supported for the following', \ 'architectures: %s.' % ', '.join(sorted(SUPPORTED_ARCHS)) -- cgit v1.2.2