diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 8dfd70be3..f0bb5b70f 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -60,26 +60,29 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       set(WORD_SIZE 64)
     endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
   endif (WORD_SIZE EQUAL 32)
-  if (WORD_SIZE EQUAL 32)
-    set(DEB_ARCHITECTURE i386)
-    set(FIND_LIBRARY_USE_LIB64_PATHS OFF)
-    set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib32 ${CMAKE_SYSTEM_LIBRARY_PATH})
-  else (WORD_SIZE EQUAL 32)
-    set(DEB_ARCHITECTURE amd64)
-    set(FIND_LIBRARY_USE_LIB64_PATHS ON)
-  endif (WORD_SIZE EQUAL 32)
 
-  execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH 
-      RESULT_VARIABLE DPKG_RESULT
-      OUTPUT_VARIABLE DPKG_ARCH
-      OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-  #message (STATUS "DPKG_RESULT ${DPKG_RESULT}, DPKG_ARCH ${DPKG_ARCH}")
-  if (DPKG_RESULT EQUAL 0)
-    set(CMAKE_LIBRARY_ARCHITECTURE ${DPKG_ARCH})
-    set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib/${DPKG_ARCH} /usr/local/lib/${DPKG_ARCH} ${CMAKE_SYSTEM_LIBRARY_PATH})
-  endif (DPKG_RESULT EQUAL 0)
+  if (NOT STANDALONE AND MULTIARCH_HACK)
+    if (WORD_SIZE EQUAL 32)
+      set(DEB_ARCHITECTURE i386)
+      set(FIND_LIBRARY_USE_LIB64_PATHS OFF)
+      set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib32 ${CMAKE_SYSTEM_LIBRARY_PATH})
+    else (WORD_SIZE EQUAL 32)
+      set(DEB_ARCHITECTURE amd64)
+      set(FIND_LIBRARY_USE_LIB64_PATHS ON)
+    endif (WORD_SIZE EQUAL 32)
 
-  include(ConfigurePkgConfig)
+    execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH 
+        RESULT_VARIABLE DPKG_RESULT
+        OUTPUT_VARIABLE DPKG_ARCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
+    #message (STATUS "DPKG_RESULT ${DPKG_RESULT}, DPKG_ARCH ${DPKG_ARCH}")
+    if (DPKG_RESULT EQUAL 0)
+      set(CMAKE_LIBRARY_ARCHITECTURE ${DPKG_ARCH})
+      set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib/${DPKG_ARCH} /usr/local/lib/${DPKG_ARCH} ${CMAKE_SYSTEM_LIBRARY_PATH})
+    endif (DPKG_RESULT EQUAL 0)
+
+    include(ConfigurePkgConfig)
+  endif (NOT STANDALONE AND MULTIARCH_HACK)
 
   set(LL_ARCH ${ARCH}_linux)
   set(LL_ARCH_DIR ${ARCH}-linux)