commit f854f30d7981795f687f9b4379100c037934535d
author niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 21 14:49:28 2014 +0000
committer niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 21 14:49:28 2014 +0000
tree 7ab267a60c08c4e43731240e04b3d6b655e731ce
parent b9a0168ddca289b1d669383a0607d69385a83554

Landing issue 15189004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14189004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6951 4adac7df-926f-26a2-2b94-8c16560cd09d

base/latebindingsymboltable.cc

diff --git a/base/latebindingsymboltable.cc b/base/latebindingsymboltable.cc
index 1896bd0..030f720 100644
--- a/base/latebindingsymboltable.cc
+++ b/base/latebindingsymboltable.cc
@@ -100,7 +100,7 @@
                    // is necessary for same-named symbols in different ABI
                    // versions of the same library to not explode.
                    RTLD_NOW|RTLD_LOCAL
-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && defined(RTLD_DEEPBIND)
                    // RTLD_DEEPBIND makes symbol dependencies in the
                    // newly-loaded tree prefer to resolve to definitions within
                    // that tree (the default on OS X). This is necessary for