diff options
| author |  makdharma <makdharma@users.noreply.github.com> | 2016-07-08 11:38:14 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-08 11:38:14 -0700 |
| commit | 46a68316c1f6706ee8ba0661ea12a50bde50f410 (patch) | |
| tree | 5abb3fe423faafbc3bf65c3b39fd77c8ee91ccf2 | |
| parent | 1b2666daea60b94987eb43241edf96af9daaf6b5 (diff) | |
| parent | ccb184068d21758f905ecc3bfd42a2f9626dd5ee (diff) | |
Merge pull request #7264 from jcanizales/p0-fix-boringssl-for-devices
Add arm_arch.h back in BoringSSL.podspec, to fix compilation for devices
| -rw-r--r-- | src/objective-c/BoringSSL.podspec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/objective-c/BoringSSL.podspec b/src/objective-c/BoringSSL.podspec index 26a0451f7d..42b4434d0d 100644 --- a/src/objective-c/BoringSSL.podspec +++ b/src/objective-c/BoringSSL.podspec @@ -109,8 +109,6 @@ Pod::Spec.new do |s| s.subspec 'Interface' do |ss| ss.header_mappings_dir = 'include/openssl' ss.source_files = 'include/openssl/*.h' - # Doesn't compile correctly; but doesn't seem to be needed: - ss.exclude_files = 'include/openssl/arm_arch.h' end s.subspec 'Implementation' do |ss| ss.header_mappings_dir = '.' @@ -147,6 +145,11 @@ Pod::Spec.new do |s| #include "ssl.h" #include "crypto.h" #include "aes.h" + /* The following macros are defined by base.h. The latter is the first file included by the + other headers. */ + #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) + # include "arm_arch.h" + #endif #include "asn1.h" #include "asn1_mac.h" #include "asn1t.h" |