kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9b68e72d18
boringssl/CMakeLists.txt

139 lines
5.5 KiB
CMake
Raw Normal View History

Only use -Wshadow with GCC > 4.6.0. Prior to 4.6.0, -Wshadow would cause GCC to warn when variables shadowed global functions. Since libc defines a number of functions with common names, this is a problem. Also, without this change, we'll keep breaking on older versions of GCC because we won't be testing with them. OpenBSD, specifically is reported to have a problem: https://boringssl-review.googlesource.com/#/c/2900/ (Note the test should really be >= 4.6.0, but CMake doesn't have a VERSION_GREATEROREQUAL.) Change-Id: I1aedda01ab629e138c8781e4319bfaaed0b236b0 Reviewed-on: https://boringssl-review.googlesource.com/2952 Reviewed-by: Adam Langley <agl@google.com>
2015-01-16 23:20:54 +00:00
cmake_minimum_required (VERSION 2.8.10)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
project (BoringSSL)
Add support for building with the Android NDK. Previously I've been using the Linaro toolchains and just building static binaries. However, the Linaro toolchains have a broken pthread_rwlock_wrlock—it does nothing and then unlocking corrupts the lock. Building with the Android NDK avoids this. These build instructions depend on https://github.com/taka-no-me/android-cmake which people will need to clone into util/ if they want to use the Android NDK. Change-Id: Ic64919f9399af2a57e8df4fb4b3400865ddb2427 Reviewed-on: https://boringssl-review.googlesource.com/4600 Reviewed-by: Adam Langley <agl@google.com>
2015-04-29 01:46:58 +01:00
if(ANDROID)
# Android-NDK CMake files reconfigure the path and so Go and Perl won't be
# found. However, ninja will still find them in $PATH if we just name them.
set(PERL_EXECUTABLE "perl")
set(GO_EXECUTABLE "go")
else()
find_package(Perl REQUIRED)
find_program(GO_EXECUTABLE go)
endif()
Find perl using the CMake's standard FindPerl module. This gives a standard PERL_EXECUTABLE configuration knob which is useful for specifying a perl to use without having it in PATH. Change-Id: I4b196b77e0b4666081a3f291fee3654c47925844 Reviewed-on: https://boringssl-review.googlesource.com/3570 Reviewed-by: Adam Langley <agl@google.com>
2015-02-23 18:06:19 +00:00
Generate error data at build time. This avoids cluttering up the diff and making merge conflicts a pain. It does, however, mean we need to generate err_data.c ahead of time in Chromium and likely other downstream builds. It also adds a build dependency on Go. Change-Id: I6e0513ed9f50cfb030f7a523ea28519590977104 Reviewed-on: https://boringssl-review.googlesource.com/3790 Reviewed-by: Adam Langley <agl@google.com>
2015-03-05 06:19:27 +00:00
if (NOT GO_EXECUTABLE)
message(FATAL_ERROR "Could not find Go")
endif()
Improve compatibility with CMake 3.0 and later CMake 3.0 changed the identifier for Apple-supplied Clang to AppleClang. CMake 3.1 changed the behavior of variable expansion in quoted strings and complains with warning CMP0054 twice without these changes. BUG=crbug.com/451610 Change-Id: I0f1514ec302cf5f1b5cfc2c5a1c71c9e20d5e855 Reviewed-on: https://boringssl-review.googlesource.com/3011 Reviewed-by: Adam Langley <agl@google.com>
2015-01-24 01:25:44 +00:00
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -ggdb -fvisibility=hidden")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -ggdb -std=c++0x -fvisibility=hidden")
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
elseif(MSVC)
Enable more warnings & treat warnings as errors on Windows. Change-Id: I2bf0144aaa8b670ff00b8e8dfe36bd4d237b9a8a Reviewed-on: https://boringssl-review.googlesource.com/3140 Reviewed-by: Adam Langley <agl@google.com>
2015-01-29 00:20:02 +00:00
set(MSVC_DISABLED_WARNINGS_LIST
"C4100" # 'exarg' : unreferenced formal parameter
"C4127" # conditional expression is constant
"C4200" # nonstandard extension used : zero-sized array in
# struct/union.
Fix standalone build on Win64. Win64 fires significantly more warnings than Win32. Also some recent changes made it grumpy. (We might want to reconsider enabling all of MSVC's warnings. Given the sorts of warnings some of these are, I'm not sure MSVC's version of -Wall -Werror is actually tenable. Plus, diverging from the Chromium build, especially before the bots are ready, is going to break pretty readily.) Change-Id: If3b8feccf910ceab4a233b0731e7624d7da46f87 Reviewed-on: https://boringssl-review.googlesource.com/3420 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 20:12:05 +00:00
"C4210" # nonstandard extension used : function given file scope
Enable more warnings & treat warnings as errors on Windows. Change-Id: I2bf0144aaa8b670ff00b8e8dfe36bd4d237b9a8a Reviewed-on: https://boringssl-review.googlesource.com/3140 Reviewed-by: Adam Langley <agl@google.com>
2015-01-29 00:20:02 +00:00
"C4242" # 'function' : conversion from 'int' to 'uint8_t',
# possible loss of data
"C4244" # 'function' : conversion from 'int' to 'uint8_t',
# possible loss of data
"C4245" # 'initializing' : conversion from 'long' to
# 'unsigned long', signed/unsigned mismatch
Fix standalone build on Win64. Win64 fires significantly more warnings than Win32. Also some recent changes made it grumpy. (We might want to reconsider enabling all of MSVC's warnings. Given the sorts of warnings some of these are, I'm not sure MSVC's version of -Wall -Werror is actually tenable. Plus, diverging from the Chromium build, especially before the bots are ready, is going to break pretty readily.) Change-Id: If3b8feccf910ceab4a233b0731e7624d7da46f87 Reviewed-on: https://boringssl-review.googlesource.com/3420 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 20:12:05 +00:00
"C4267" # conversion from 'size_t' to 'int', possible loss of data
"C4371" # layout of class may have changed from a previous version of the
# compiler due to better packing of member '...'
"C4388" # signed/unsigned mismatch
Enable more warnings & treat warnings as errors on Windows. Change-Id: I2bf0144aaa8b670ff00b8e8dfe36bd4d237b9a8a Reviewed-on: https://boringssl-review.googlesource.com/3140 Reviewed-by: Adam Langley <agl@google.com>
2015-01-29 00:20:02 +00:00
"C4296" # '>=' : expression is always true
"C4350" # behavior change: 'std::_Wrap_alloc...'
"C4365" # '=' : conversion from 'size_t' to 'int',
# signed/unsigned mismatch
"C4389" # '!=' : signed/unsigned mismatch
"C4510" # 'argument' : default constructor could not be generated
"C4512" # 'argument' : assignment operator could not be generated
"C4514" # 'function': unreferenced inline function has been removed
"C4548" # expression before comma has no effect; expected expression with
# side-effect" caused by FD_* macros.
"C4610" # struct 'argument' can never be instantiated - user defined
# constructor required.
Fix standalone build on Win64. Win64 fires significantly more warnings than Win32. Also some recent changes made it grumpy. (We might want to reconsider enabling all of MSVC's warnings. Given the sorts of warnings some of these are, I'm not sure MSVC's version of -Wall -Werror is actually tenable. Plus, diverging from the Chromium build, especially before the bots are ready, is going to break pretty readily.) Change-Id: If3b8feccf910ceab4a233b0731e7624d7da46f87 Reviewed-on: https://boringssl-review.googlesource.com/3420 Reviewed-by: Adam Langley <agl@google.com>
2015-02-11 20:12:05 +00:00
"C4625" # copy constructor could not be generated because a base class
# copy constructor is inaccessible or deleted
"C4626" # assignment operator could not be generated because a base class
# assignment operator is inaccessible or deleted
Enable more warnings & treat warnings as errors on Windows. Change-Id: I2bf0144aaa8b670ff00b8e8dfe36bd4d237b9a8a Reviewed-on: https://boringssl-review.googlesource.com/3140 Reviewed-by: Adam Langley <agl@google.com>
2015-01-29 00:20:02 +00:00
"C4706" # assignment within conditional expression
"C4710" # 'function': function not inlined
"C4711" # function 'function' selected for inline expansion
"C4800" # 'int' : forcing value to bool 'true' or 'false'
# (performance warning)
"C4820" # 'bytes' bytes padding added after construct 'member_name'
"C4996" # 'read': The POSIX name for this item is deprecated. Instead,
# use the ISO C++ conformant name: _read.
)
string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR
${MSVC_DISABLED_WARNINGS_LIST})
set(CMAKE_C_FLAGS "-Wall -WX ${MSVC_DISABLED_WARNINGS_STR}")
set(CMAKE_CXX_FLAGS "-Wall -WX ${MSVC_DISABLED_WARNINGS_STR}")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
add_definitions(-D_HAS_EXCEPTIONS=0)
Define WIN32_LEAN_AND_MEAN in the build system, not in the code. This avoids a conflict with the Chromium build system, which defines WIN32_LEAN_AND_MEAN with a different value. BUG=crbug.com/453196 Change-Id: Ia15ec7c20325c1961af4f32e5208266e5f846f35 Reviewed-on: https://boringssl-review.googlesource.com/3150 Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
2015-01-29 04:34:47 +00:00
add_definitions(-DWIN32_LEAN_AND_MEAN)
Define NOMINMAX across the entire project. This fixes the standalone build on Windows and matches Chromium. Change-Id: I194f53e0a610c5ae9cef53c826b22f7bded5f357 Reviewed-on: https://boringssl-review.googlesource.com/4201 Reviewed-by: Adam Langley <agl@google.com>
2015-04-02 18:20:01 +01:00
add_definitions(-DNOMINMAX)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
endif()
Bump the -Wshadow cutoff to 4.8 rather than 4.6. Per https://gcc.gnu.org/gcc-4.8/changes.html, -Wshadow was made less trigger-happy starting 4.8. Change-Id: I023919dea3497e2dd27679a6f0c4a114c0b30337 Reviewed-on: https://boringssl-review.googlesource.com/3730 Reviewed-by: Adam Langley <agl@google.com>
2015-02-28 05:00:44 +00:00
if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.7.99") OR
Improve compatibility with CMake 3.0 and later CMake 3.0 changed the identifier for Apple-supplied Clang to AppleClang. CMake 3.1 changed the behavior of variable expansion in quoted strings and complains with warning CMP0054 twice without these changes. BUG=crbug.com/451610 Change-Id: I0f1514ec302cf5f1b5cfc2c5a1c71c9e20d5e855 Reviewed-on: https://boringssl-review.googlesource.com/3011 Reviewed-by: Adam Langley <agl@google.com>
2015-01-24 01:25:44 +00:00
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
Only use -Wshadow with GCC > 4.6.0. Prior to 4.6.0, -Wshadow would cause GCC to warn when variables shadowed global functions. Since libc defines a number of functions with common names, this is a problem. Also, without this change, we'll keep breaking on older versions of GCC because we won't be testing with them. OpenBSD, specifically is reported to have a problem: https://boringssl-review.googlesource.com/#/c/2900/ (Note the test should really be >= 4.6.0, but CMake doesn't have a VERSION_GREATEROREQUAL.) Change-Id: I1aedda01ab629e138c8781e4319bfaaed0b236b0 Reviewed-on: https://boringssl-review.googlesource.com/2952 Reviewed-by: Adam Langley <agl@google.com>
2015-01-16 23:20:54 +00:00
endif()
Add visibility rules. This change marks public symbols as dynamically exported. This means that it becomes viable to build a shared library of libcrypto and libssl with -fvisibility=hidden. On Windows, one not only needs to mark functions for export in a component, but also for import when using them from a different component. Because of this we have to build with |BORINGSSL_IMPLEMENTATION| defined when building the code. Other components, when including our headers, won't have that defined and then the |OPENSSL_EXPORT| tag becomes an import tag instead. See the #defines in base.h In the asm code, symbols are now hidden by default and those that need to be exported are wrapped by a C function. In order to support Chromium, a couple of libssl functions were moved to ssl.h from ssl_locl.h: ssl_get_new_session and ssl_update_cache. Change-Id: Ib4b76e2f1983ee066e7806c24721e8626d08a261 Reviewed-on: https://boringssl-review.googlesource.com/1350 Reviewed-by: Adam Langley <agl@google.com>
2014-07-31 00:02:14 +01:00
add_definitions(-DBORINGSSL_IMPLEMENTATION)
Honor the standard BUILD_SHARED_LIBS cmake variable. The variable switches the default type for add_library from STATIC to SHARED. We can condition additional stuff on that for convenience. (tabtest still doesn't build.) BoringSSL as any kind of stable system shared library is still very much unsupported, but this is probably handy for making sure we don't forget all those pesky OPENSSL_EXPORTs. Change-Id: I66ab80bcddbf3724e03e85384141fdf4f4acbc2e Reviewed-on: https://boringssl-review.googlesource.com/3092 Reviewed-by: Adam Langley <agl@google.com>
2015-01-28 05:50:21 +00:00
if (BUILD_SHARED_LIBS)
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
add_definitions(-DBORINGSSL_SHARED_LIBRARY)
# Enable position-independent code globally. This is needed because
# some library targets are OBJECT libraries.
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
Honor the standard BUILD_SHARED_LIBS cmake variable. The variable switches the default type for add_library from STATIC to SHARED. We can condition additional stuff on that for convenience. (tabtest still doesn't build.) BoringSSL as any kind of stable system shared library is still very much unsupported, but this is probably handy for making sure we don't forget all those pesky OPENSSL_EXPORTs. Change-Id: I66ab80bcddbf3724e03e85384141fdf4f4acbc2e Reviewed-on: https://boringssl-review.googlesource.com/3092 Reviewed-by: Adam Langley <agl@google.com>
2015-01-28 05:50:21 +00:00
endif()
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "x86_64")
Fix CPU architecture detection on BSDs. CMake calls "uname" in order to detect the CPU architecture, so $(CMAKE_SYSTEM_PROCESSOR) varies from platform to platform. This changes adds support for "i386" and "amd64" values, which are used by BSDs for the x86 family of CPUs. Change-Id: I532ce787a9ac06220c92a6d8c78ad5a55d8c40bf Signed-off-by: Piotr Sikora <piotr@cloudflare.com> Reviewed-on: https://boringssl-review.googlesource.com/1360 Reviewed-by: Adam Langley <agl@google.com>
2014-07-31 11:09:49 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "x86_64")
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
# cmake reports AMD64 on Windows, but we might be building for 32-bit.
if (CMAKE_CL_64)
set(ARCH "x86_64")
else()
set(ARCH "x86")
endif()
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "x86")
Fix CPU architecture detection on BSDs. CMake calls "uname" in order to detect the CPU architecture, so $(CMAKE_SYSTEM_PROCESSOR) varies from platform to platform. This changes adds support for "i386" and "amd64" values, which are used by BSDs for the x86 family of CPUs. Change-Id: I532ce787a9ac06220c92a6d8c78ad5a55d8c40bf Signed-off-by: Piotr Sikora <piotr@cloudflare.com> Reviewed-on: https://boringssl-review.googlesource.com/1360 Reviewed-by: Adam Langley <agl@google.com>
2014-07-31 11:09:49 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "x86")
Recognise "i686" as an x86 CPU. Building under Ubuntu x86 fails with "Unknown processor:i686". This adds i686 to CMakeLists.txt, fixing the build. Change-Id: Ic1c7ce452c019b8a2a875d64a707f640d86c7e31
2014-08-11 21:27:44 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "x86")
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "arm")
Add support for building with the Android NDK. Previously I've been using the Linaro toolchains and just building static binaries. However, the Linaro toolchains have a broken pthread_rwlock_wrlock—it does nothing and then unlocking corrupts the lock. Building with the Android NDK avoids this. These build instructions depend on https://github.com/taka-no-me/android-cmake which people will need to clone into util/ if they want to use the Android NDK. Change-Id: Ic64919f9399af2a57e8df4fb4b3400865ddb2427 Reviewed-on: https://boringssl-review.googlesource.com/4600 Reviewed-by: Adam Langley <agl@google.com>
2015-04-29 01:46:58 +01:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7-a")
set(ARCH "arm")
aarch64 support. This is an initial cut at aarch64 support. I have only qemu to test it however—hopefully hardware will be coming soon. This also affects 32-bit ARM in that aarch64 chips can run 32-bit code and we would like to be able to take advantage of the crypto operations even in 32-bit mode. AES and GHASH should Just Work in this case: the -armx.pl files can be built for either 32- or 64-bit mode based on the flavour argument given to the Perl script. SHA-1 and SHA-256 don't work like this however because they've never support for multiple implementations, thus BoringSSL built for 32-bit won't use the SHA instructions on an aarch64 chip. No dedicated ChaCha20 or Poly1305 support yet. Change-Id: Ib275bc4894a365c8ec7c42f4e91af6dba3bd686c Reviewed-on: https://boringssl-review.googlesource.com/2801 Reviewed-by: Adam Langley <agl@google.com>
2015-01-09 23:44:37 +00:00
elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
set(ARCH "aarch64")
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
else()
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR})
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
endif()
Add support for building with the Android NDK. Previously I've been using the Linaro toolchains and just building static binaries. However, the Linaro toolchains have a broken pthread_rwlock_wrlock—it does nothing and then unlocking corrupts the lock. Building with the Android NDK avoids this. These build instructions depend on https://github.com/taka-no-me/android-cmake which people will need to clone into util/ if they want to use the Android NDK. Change-Id: Ic64919f9399af2a57e8df4fb4b3400865ddb2427 Reviewed-on: https://boringssl-review.googlesource.com/4600 Reviewed-by: Adam Langley <agl@google.com>
2015-04-29 01:46:58 +01:00
if (ANDROID AND ${ARCH} STREQUAL "arm")
# The Android-NDK CMake files somehow fail to set the -march flag for
# assembly files. Without this flag, the compiler believes that it's
# building for ARMv5.
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a")
endif()
Make build work on OS X with older cmake versions. `uname -p` is still i386 on OS X for some reason, which causes cmake 2.8 to set CMAKE_SYSTEM_PROCESSOR to i386, making the build think it's doing a 32-bit build. However, since the system is almost completely 64-bit these days, clang defaults to producing 64-bit object files unless told otherwise. As a result, the produced .o files are all 64-bit except for the .o files from assembly, and then linking fails. Fix this by forcing ARCH to 64-bit on OS X. This matches the default behavior of cmake 3.0, where CMAKE_SYSTEM_PROCESSOR is x86_64. Change-Id: I7a2abc4cef84dfbaf205852a9d7b647e83dd249f Reviewed-on: https://boringssl-review.googlesource.com/2330 Reviewed-by: Adam Langley <agl@google.com> Reviewed-by: Piotr Sikora <piotr@cloudflare.com>
2014-11-18 20:14:46 +00:00
if (${ARCH} STREQUAL "x86" AND APPLE)
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
# With CMake 2.8.x, ${CMAKE_SYSTEM_PROCESSOR} evalutes to i386 on OS X,
# but clang defaults to 64-bit builds on OS X unless otherwise told.
# Set ARCH to x86_64 so clang and CMake agree. This is fixed in CMake 3.
set(ARCH "x86_64")
Make build work on OS X with older cmake versions. `uname -p` is still i386 on OS X for some reason, which causes cmake 2.8 to set CMAKE_SYSTEM_PROCESSOR to i386, making the build think it's doing a 32-bit build. However, since the system is almost completely 64-bit these days, clang defaults to producing 64-bit object files unless told otherwise. As a result, the produced .o files are all 64-bit except for the .o files from assembly, and then linking fails. Fix this by forcing ARCH to 64-bit on OS X. This matches the default behavior of cmake 3.0, where CMAKE_SYSTEM_PROCESSOR is x86_64. Change-Id: I7a2abc4cef84dfbaf205852a9d7b647e83dd249f Reviewed-on: https://boringssl-review.googlesource.com/2330 Reviewed-by: Adam Langley <agl@google.com> Reviewed-by: Piotr Sikora <piotr@cloudflare.com>
2014-11-18 20:14:46 +00:00
endif()
Fix OPENSSL_NO_ASM build and promote to a cmake build flag. Just changing preprocessor definitions doesn't exclude the assembly files. BUG=484327 Change-Id: I98453d291a6afb8dc8beb179f931c74301a7f434 Reviewed-on: https://boringssl-review.googlesource.com/4610 Reviewed-by: Adam Langley <agl@google.com>
2015-05-04 20:16:57 +01:00
if (OPENSSL_NO_ASM)
add_definitions(-DOPENSSL_NO_ASM)
set(ARCH "generic")
endif()
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(crypto)
add_subdirectory(ssl)
add_subdirectory(ssl/test)
add_subdirectory(tool)
Add decrepit, initially containing CAST and Blowfish. decrepit will contain algorithms that we really wish didn't exist any longer. It won't be built by default in Chromium etc, but the code will exist for crummy code that still needs it. Change-Id: Ic307f5f0a69efe9e0a5fd54052f49d219e90dcdd
2015-02-03 18:45:12 +00:00
add_subdirectory(decrepit)
Reference in New Issue Copy Permalink