Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix building with 3rd party OpenSSL:
don't incorrectly rely on boringssl directly from sha1 code, but rather go through our selector target (and similarly use it to find the includes) to find the ssl lib one is supposed to use.

Fixes #1139 too
  • Loading branch information
morlovich committed Jan 28, 2016
1 parent e97fe1e commit 5b8253a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pagespeed/kernel.gyp
Expand Up @@ -116,7 +116,7 @@
'dependencies': [
'pagespeed_base_core',
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'<(DEPTH)/third_party/serf/openssl.gyp:openssl',
'<(DEPTH)/third_party/serf/select_openssl.gyp:select_openssl',
],
},
{
Expand Down
2 changes: 1 addition & 1 deletion pagespeed/kernel/base/sha1_signature.cc
Expand Up @@ -23,7 +23,7 @@
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#if ENABLE_URL_SIGNATURES
#include "third_party/boringssl/src/include/openssl/hmac.h"
#include <openssl/hmac.h>
#endif

namespace net_instaweb {
Expand Down

0 comments on commit 5b8253a

Please sign in to comment.