diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index 81493dfdff3e15270428fba361855d69a3d332c0..0ab57e48db6c3ff10ac9d8f06dc0eb17f70993c8 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -1,25 +1,27 @@
 # -*- cmake -*-
 include(Prebuilt)
 
+use_prebuilt_binary(llphysicsextensions)
 set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include)
 
-if (INSTALL_PROPRIETARY AND NOT STANDALONE)
-   use_prebuilt_binary(llphysicsextensions)
+set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
+set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
 
-   set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
-   set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
+if (INSTALL_PROPRIETARY AND NOT STANDALONE)
+    set(LL_PHYSICS_LIB_NAME "llphysicsextensions")
+else (INSTALL_PROPRIETARY AND NOT STANDALONE)
+    set(LL_PHYSICS_LIB_NAME "llphysicsextensionsstub")
+endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
 
-   find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
-   find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
+find_library(LL_PHYSICS_DEBUG_LIB ${LL_PHYSICS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
+find_library(LL_PHYSICS_RELEASE_LIB ${LL_PHYSICS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
 
-   set(LLPHYSICS_LIBRARIES
-       debug     ${LL_PHYSICS_DEBUG_LIB}
-       optimized ${LL_PHYSICS_RELEASE_LIB}
-   )
+set(LLPHYSICS_LIBRARIES
+    debug     ${LL_PHYSICS_DEBUG_LIB}
+    optimized ${LL_PHYSICS_RELEASE_LIB}
+)
 
-   if (LINUX)
-       list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group)
-       list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
-   endif (LINUX)
-else (INSTALL_PROPRIETARY AND NOT STANDALONE)
-endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
+if (LINUX)
+    list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group)
+    list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
+endif (LINUX)