diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-04-02 12:40:06 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-04-02 12:40:06 +0000 |
| commit | a12536de6709f0d02fb0370e6c9e8afb38c03fc4 (patch) | |
| tree | d46143249bd7e9a39e027f3c349ceb46197f9c2a /openssl.target.linux-x86.mk | |
| parent | cb36183092beb8e2387abca23e11311642e26002 (diff) | |
| download | openssl-a12536de6709f0d02fb0370e6c9e8afb38c03fc4.tar.gz | |
Update makefiles after merge of Chromium at r191819
This commit was generated by merge_from_chromium.py.
Change-Id: I406eebd758f47f558f75df8372ed8d89b3605a86
Diffstat (limited to 'openssl.target.linux-x86.mk')
| -rw-r--r-- | openssl.target.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index a468bf9..e0b3d3e 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -595,6 +595,7 @@ MY_CFLAGS := \ -march=pentium4 \ -msse2 \ -mfpmath=sse \ + -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -619,7 +620,6 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ - '-DUSE_SKIA' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ @@ -627,7 +627,6 @@ MY_DEFS := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_PEPPER_THREADING' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -684,6 +683,7 @@ LOCAL_LDFLAGS := \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ + -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ |