Skip to content
Snippets Groups Projects
Commit 8c11c69b authored by Simon McVittie's avatar Simon McVittie
Browse files

helpers: Check for $LIB = lib32, lib64 generically


pressure-vessel is currently x86-only, but we want to be portable to
non-x86 if it's easy to do. It's reasonably common for all architectures
to use lib, lib32 or lib64 for $LIB.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 89207320
No related branches found
No related tags found
1 merge request!302helpers: Refactor $LIB, $PLATFORM detection
......@@ -164,13 +164,20 @@ executable(
subdir('lib')
sizeof_pointer = c_compiler.sizeof('void*')
if sizeof_pointer == 4
subdir('lib32')
elif sizeof_pointer == 8
subdir('lib64')
endif
if multiarch == 'i386-linux-gnu'
subdir('i386')
subdir('i486')
subdir('i586')
subdir('i686')
subdir('lib32')
subdir('lib/i386-linux-gnu')
# This is to support Ubuntu 12.04 where $LIB wrongly expanded to just
......@@ -181,7 +188,6 @@ elif multiarch == 'x86_64-linux-gnu'
subdir('x86_64')
subdir('xeon_phi')
subdir('lib64')
subdir('lib/x86_64-linux-gnu')
# To support Ubuntu 12.04, see above
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment