diff --git a/helpers/meson.build b/helpers/meson.build index 10bf796575d10162c5c7409bc361faf08d598123..f97dca075c6e50b34efc98ebd1e928ae47dfe2c9 100644 --- a/helpers/meson.build +++ b/helpers/meson.build @@ -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