From 3fda523e9df83c1dc14baf42d89dd34bf78c079a Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Tue, 21 Jun 2016 22:52:20 -0500
Subject: [PATCH] 32-bit C++11 fixes.

---
 autobuild.xml                                | 4 ++--
 indra/media_plugins/cef/CMakeLists.txt       | 3 ++-
 indra/media_plugins/quicktime/CMakeLists.txt | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 95e34e4d24..b506ea3763 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1673,11 +1673,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>82779518d3079508ecdafe708e003aaf</string>
+              <string>85d8896ca1cec09affc48122aeea22d2</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>http://downloads.phoenixviewer.com/llceflib-1.5.3.201601201743-r174-darwin-201601201743-r174.tar.bz2</string>
+              <string>http://downloads.phoenixviewer.com/llceflib-1.5.3.201606212155-r177-darwin-201606212155-r177.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 72c6cc93da..adb3e2f732 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -123,7 +123,8 @@ if (DARWIN)
     PREFIX ""
     BUILD_WITH_INSTALL_RPATH 1
     INSTALL_NAME_DIR "@executable_path"
-    LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
+    CXX_FLAGS "-std=c++11 -stdlib=libc++"
+    LINK_FLAGS "-stdlib=libc++ -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
   )
 
   add_custom_command(TARGET media_plugin_cef
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt
index c5615145be..4e3a564cd8 100644
--- a/indra/media_plugins/quicktime/CMakeLists.txt
+++ b/indra/media_plugins/quicktime/CMakeLists.txt
@@ -75,7 +75,7 @@ if (QUICKTIME)
         PREFIX ""
         BUILD_WITH_INSTALL_RPATH 1
         INSTALL_NAME_DIR "@executable_path"
-        LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
+        LINK_FLAGS "-stdlib=libc++ -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
       )
 
 # We use a bunch of deprecated system APIs.