Fixup for bug 1081034 - Add missing #ifdef to avoid build failure on desktop linux. r=me,npotb,DONTBUILD
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 17 Oct 2014 14:09:17 +0900
changeset 210822 e0f3e4607276687bf2f6eeecf0605662f91fd4be
parent 210821 3d9c386f1c0ecad8b5aa2d275994c49ab8fcd0c5
child 210823 375f9239e689df6a90ce90af6292d32257f73034
push id50561
push usermh@glandium.org
push dateFri, 17 Oct 2014 05:09:41 +0000
treeherdermozilla-inbound@e0f3e4607276 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, npotb, DONTBUILD
bugs1081034
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fixup for bug 1081034 - Add missing #ifdef to avoid build failure on desktop linux. r=me,npotb,DONTBUILD
mozglue/linker/ElfLoader.cpp
--- a/mozglue/linker/ElfLoader.cpp
+++ b/mozglue/linker/ElfLoader.cpp
@@ -507,17 +507,19 @@ ElfLoader::Init()
 }
 
 ElfLoader::~ElfLoader()
 {
   LibHandleList list;
 
   /* Release self_elf and libc */
   self_elf = nullptr;
+#if defined(ANDROID)
   libc = nullptr;
+#endif
 
   /* Build up a list of all library handles with direct (external) references.
    * We actually skip system library handles because we want to keep at least
    * some of these open. Most notably, Mozilla codebase keeps a few libgnome
    * libraries deliberately open because of the mess that libORBit destruction
    * is. dlclose()ing these libraries actually leads to problems. */
   for (LibHandleList::reverse_iterator it = handles.rbegin();
        it < handles.rend(); ++it) {