Fix architecture detection.

diff --git a/src/libcryptobox/curve25519/curve25519.c b/src/libcryptobox/curve25519/curve25519.c
index 1d04b973baddeb598740fd9717a6453b77d16bc3..34a361d607437c2b6cdd7a1dcaefb7586ceb1720 100644 (file)
--- a/src/libcryptobox/curve25519/curve25519.c
+++ b/src/libcryptobox/curve25519/curve25519.c
@@ -55,7 +55,7 @@ CURVE25519_DECLARE(avx);
 CURVE25519_DECLARE(ref);
 #define CURVE25519_REF CURVE25519_IMPL(0, "ref", ref)
 
-#if (ARCH == x86_64) || (ARCH == i386)
+#if defined(CMAKE_ARCH_x86_64) || defined(CMAKE_ARCH_i386)
 CURVE25519_DECLARE(donna);
 #define CURVE25519_GENERIC CURVE25519_IMPL(0, "donna", donna)
 #else

diff --git a/src/libcryptobox/platform_config.h.in b/src/libcryptobox/platform_config.h.in
index b71306e997aa298302025e5e9b4b1b40142179c0..577e8528bcf87548ed99c151893914bb8e458716 100644 (file)
--- a/src/libcryptobox/platform_config.h.in
+++ b/src/libcryptobox/platform_config.h.in
@@ -1,7 +1,8 @@
 #ifndef PLATFORM_H_CONFIG
 #define PLATFORM_H_CONFIG
 
-#define ARCH ${ARCH}
+#define ARCH "${ARCH}"
+#define CMAKE_ARCH_${ARCH} 1
 #cmakedefine HAVE_AVX2 1
 #cmakedefine HAVE_AVX  1
 #cmakedefine HAVE_SSE2 1