summaryrefslogtreecommitdiffstats
path: root/src/crypto/CMakeLists.txt
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-09-25 02:29:14 +0000
committerKenny Root <kroot@google.com>2015-09-25 02:29:14 +0000
commitb8494591d1b1a143f3b192d845c238bbf3bc629d (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /src/crypto/CMakeLists.txt
parenta04d78d392463df4e69a64360c952ffa5abd22f7 (diff)
downloadexternal_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip
external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz
external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'src/crypto/CMakeLists.txt')
-rw-r--r--src/crypto/CMakeLists.txt7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 6858cbb..3115279 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,7 +57,6 @@ if (${ARCH} STREQUAL "x86_64")
set(
CRYPTO_ARCH_SOURCES
- cpu-x86_64-asm.${ASM_EXT}
cpu-intel.c
)
endif()
@@ -66,7 +65,6 @@ if (${ARCH} STREQUAL "x86")
set(
CRYPTO_ARCH_SOURCES
- cpu-x86-asm.${ASM_EXT}
cpu-intel.c
)
endif()
@@ -230,6 +228,3 @@ 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)