summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2012-12-10 10:39:54 +0000
committerdigit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2012-12-10 10:39:54 +0000
commit6fd523ec85cba28078b534d1ea5464d7f37db4c3 (patch)
tree75648cfd73c9850670a1bdb273aef3a77a9e05c9 /config
parent57593dddce5c5516688e37c83a1eadbd0dc9fda0 (diff)
downloadopenssl-6fd523ec85cba28078b534d1ea5464d7f37db4c3.tar.gz
Fix x86 linux_redux build.
This should have been part of the previous patch. Not sure why this was left out. Without this, the x64 build fails with a link error due to undefined OPENSSL_setup_cpuid function. BUG=137071 TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/11494005 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@172029 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'config')
-rw-r--r--config/k8/openssl/opensslconf.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/config/k8/openssl/opensslconf.h b/config/k8/openssl/opensslconf.h
index 1f71022..c76f640 100644
--- a/config/k8/openssl/opensslconf.h
+++ b/config/k8/openssl/opensslconf.h
@@ -112,8 +112,6 @@
# endif
#endif
-#define OPENSSL_CPUID_OBJ
-
/* crypto/opensslconf.h.in */
#ifdef OPENSSL_DOING_MAKEDEPEND