summaryrefslogtreecommitdiffstats
path: root/src/crypto/CMakeLists.txt
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-09-25 00:26:37 +0000
committerKenny Root <kroot@google.com>2015-09-25 00:26:37 +0000
commita04d78d392463df4e69a64360c952ffa5abd22f7 (patch)
treedc62c249d595198e0d99e43890019d21e901fbec /src/crypto/CMakeLists.txt
parent1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff)
downloadexternal_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.zip
external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.gz
external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.bz2
Revert "external/boringssl: sync with upstream."
This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
Diffstat (limited to 'src/crypto/CMakeLists.txt')
-rw-r--r--src/crypto/CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 3115279..6858cbb 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(../include)
+include_directories(. ../include)
if(APPLE)
if (${ARCH} STREQUAL "x86")
@@ -57,6 +57,7 @@ if (${ARCH} STREQUAL "x86_64")
set(
CRYPTO_ARCH_SOURCES
+ cpu-x86_64-asm.${ASM_EXT}
cpu-intel.c
)
endif()
@@ -65,6 +66,7 @@ if (${ARCH} STREQUAL "x86")
set(
CRYPTO_ARCH_SOURCES
+ cpu-x86-asm.${ASM_EXT}
cpu-intel.c
)
endif()
@@ -228,3 +230,6 @@ add_executable(
)
target_link_libraries(refcount_test crypto)
+
+perlasm(cpu-x86_64-asm.${ASM_EXT} cpu-x86_64-asm.pl)
+perlasm(cpu-x86-asm.${ASM_EXT} cpu-x86-asm.pl)