diff options
| author | Timur I. Bakeyev <timur@iXsystems.com> | 2018-07-08 18:45:59 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-08-15 07:08:25 +0200 |
| commit | 1da4ff2e64469dc8494ba895453d60206f030db4 (patch) | |
| tree | ba652a39fc3e8278d8a86a0215a45024fdc4f189 /third_party | |
| parent | 371c5c70f78a65af6fcc4d124eae8c10b26bdc48 (diff) | |
| download | samba-1da4ff2e64469dc8494ba895453d60206f030db4.tar.gz | |
third_party:build: Test for the flags, recognized by Clang.
Make amd64 SYSTEM_UNAME_MACHINE an alias for x86_64.
Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/aesni-intel/wscript | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript index f0723a52501..8f2260b9560 100644 --- a/third_party/aesni-intel/wscript +++ b/third_party/aesni-intel/wscript @@ -4,14 +4,19 @@ import Utils def configure(conf): if Options.options.accel_aes.lower() == "intelaesni": - if conf.CHECK_CFLAGS('-Wp,-E,-lang-asm', ''): - if conf.env['SYSTEM_UNAME_MACHINE'] == 'x86_64': + asm_flags = ('-Wp,-E,-lang-asm', '-xassembler-with-cpp') + for f in asm_flags: + if conf.CHECK_CFLAGS(f, ''): + conf.DEFINE('AESNI_INTEL_CFLAGS', f) + break + if conf.CONFIG_SET('AESNI_INTEL_CFLAGS'): + if conf.env['SYSTEM_UNAME_MACHINE'] in ('x86_64', 'amd64'): print("Compiling with Intel AES instructions") conf.DEFINE('HAVE_AESNI_INTEL', 1) else: raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU') else: - raise Utils.WafError('--accel-aes=intelaesni selected and compiler rejects -Wp,-E,-lang-asm') + raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags)) if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'): raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack') @@ -21,6 +26,6 @@ def build(bld): bld.SAMBA_LIBRARY('aesni-intel', source='aesni-intel_asm.c', - cflags='-Wp,-E,-lang-asm', + cflags=bld.CONFIG_GET('AESNI_INTEL_CFLAGS'), ldflags='-Wl,-z,noexecstack', private_library=True) |