Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: openssl.gyp

Issue 231353003: Adds support for compiling OpenSSL on mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « import_from_android.sh ('k') | openssl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl.gyp
diff --git a/openssl.gyp b/openssl.gyp
index 30a1b27cc109a10dabbe4c5da76ba49f29422503..1eb08d5ba6e6efb053fddb3489c61aa36cf917b9 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -59,12 +59,27 @@
'defines': [ '<@(openssl_mips_defines)' ],
'defines!': [ 'OPENSSL_NO_ASM' ],
}],
- ['target_arch == "ia32"', {
+ ['target_arch == "ia32" and OS !="mac"', {
'sources': [ '<@(openssl_x86_sources)' ],
'sources!': [ '<@(openssl_x86_source_excludes)' ],
'defines': [ '<@(openssl_x86_defines)' ],
'defines!': [ 'OPENSSL_NO_ASM' ],
}],
+ ['target_arch == "ia32" and OS == "mac"', {
+ 'sources': [ '<@(openssl_mac_ia32_sources)' ],
+ 'sources!': [ '<@(openssl_mac_ia32_source_excludes)' ],
+ 'defines': [ '<@(openssl_mac_ia32_defines)' ],
+ 'defines!': [ 'OPENSSL_NO_ASM' ],
+ 'variables': {
+ # Ensure the 32-bit opensslconf.h header for OS X is used.
+ 'openssl_include_dirs+': [ 'config/mac/ia32' ],
+ 'openssl_public_include_dirs+': [ 'config/mac/ia32' ],
+ },
+ 'xcode_settings': {
+ # Clang needs this to understand the inline assembly keyword 'asm'.
+ 'GCC_C_LANGUAGE_STANDARD': 'gnu99',
+ },
+ }],
['target_arch == "x64"', {
'sources': [ '<@(openssl_x86_64_sources)' ],
'sources!': [ '<@(openssl_x86_64_source_excludes)' ],
« no previous file with comments | « import_from_android.sh ('k') | openssl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698