diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:30 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:30 +0100 |
| commit | 3fe7f77ca96ac4bfc8fb0a9f4886191095e8077b (patch) | |
| tree | 009b807ced77d3d1c7e5e68ff80cdc2a1a110c2f | |
| parent | 4d9cf43a1f955793193852d2283e96484246ba8d (diff) | |
| parent | bd7bbb3706a0305f6a0b4491b4be3114d7db3766 (diff) | |
| download | openssl-3fe7f77ca96ac4bfc8fb0a9f4886191095e8077b.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I4b3f80643b140e005bdbb433ac85282a0a4a04de
| -rw-r--r-- | openssl.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index f5fa163..7b54d4a 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -617,6 +617,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 90e78a5..ce56293 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -617,6 +617,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 243ab58..65d9cba 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -622,6 +622,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index f5fa163..7b54d4a 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -617,6 +617,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 90e78a5..ce56293 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -617,6 +617,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 243ab58..65d9cba 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -622,6 +622,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ |