diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-11 14:41:47 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-11 14:41:47 -0600 |
| commit | 7bce6417a35943d616cf15540e6388b8c2b1ef76 (patch) | |
| tree | 0c76115c1af221b562e1fc4c1e54ca069bd32bf8 /src | |
| parent | crypto: do not use compound literals in selftests (diff) | |
| download | wireguard-monolithic-historical-7bce6417a35943d616cf15540e6388b8c2b1ef76.tar.xz wireguard-monolithic-historical-7bce6417a35943d616cf15540e6388b8c2b1ef76.zip | |
crypto: make sure UML is properly disabled
Diffstat (limited to 'src')
| -rw-r--r-- | src/crypto/Kbuild.include | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crypto/Kbuild.include b/src/crypto/Kbuild.include index d12930d..c252c80 100644 --- a/src/crypto/Kbuild.include +++ b/src/crypto/Kbuild.include @@ -7,7 +7,7 @@ endif ccflags-y += -I$(src)/crypto/include wireguard-y += crypto/zinc/chacha20/chacha20.o -ifeq ($(CONFIG_X86_64)$(CONFIG_UML),y) +ifeq ($(CONFIG_X86_64)$(if $(CONFIG_UML),y,n),yn) wireguard-y += crypto/zinc/chacha20/chacha20-x86_64.o CFLAGS_chacha20.o += -include $(cmd_include_path_prefix)/crypto/zinc/chacha20/chacha20-x86_64-glue.h endif @@ -25,7 +25,7 @@ CFLAGS_chacha20.o += -include $(cmd_include_path_prefix)/crypto/zinc/chacha20/ch endif wireguard-y += crypto/zinc/poly1305/poly1305.o -ifeq ($(CONFIG_X86_64)$(CONFIG_UML),y) +ifeq ($(CONFIG_X86_64)$(if $(CONFIG_UML),y,n),yn) wireguard-y += crypto/zinc/poly1305/poly1305-x86_64.o CFLAGS_poly1305.o += -include $(cmd_include_path_prefix)/crypto/zinc/poly1305/poly1305-x86_64-glue.h endif @@ -53,12 +53,12 @@ ifeq ($(CONFIG_ARM)$(CONFIG_KERNEL_MODE_NEON),yy) wireguard-y += crypto/zinc/curve25519/curve25519-arm.o CFLAGS_curve25519.o += -include $(cmd_include_path_prefix)/crypto/zinc/curve25519/curve25519-arm-glue.h endif -ifeq ($(CONFIG_X86_64)$(CONFIG_UML),y) +ifeq ($(CONFIG_X86_64)$(if $(CONFIG_UML),y,n),yn) CFLAGS_curve25519.o += -include $(cmd_include_path_prefix)/crypto/zinc/curve25519/curve25519-x86_64-glue.h endif wireguard-y += crypto/zinc/blake2s/blake2s.o -ifeq ($(CONFIG_X86_64)$(CONFIG_UML),y) +ifeq ($(CONFIG_X86_64)$(if $(CONFIG_UML),y,n),yn) wireguard-y += crypto/zinc/blake2s/blake2s-x86_64.o CFLAGS_blake2s.o += -include $(cmd_include_path_prefix)/crypto/zinc/blake2s/blake2s-x86_64-glue.h endif |