2 files changed, 20 insertions, 1 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index d335cb0..6403d49 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -20,6 +20,14 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
     "Supported build types." FORCE)
 
 
+# Determine the number of bits of this processor
+
+if(CMAKE_SIZEOF_VOID_P MATCHES 4)
+   set( HAVE_64_BIT 0 )
+else(CMAKE_SIZEOF_VOID_P MATCHES 4)
+   set( HAVE_64_BIT 1 )
+endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
+
 # Platform-specific compilation flags.
 
 if (WINDOWS)
diff --git a/linden/indra/cmake/LLCommon.cmake b/linden/indra/cmake/LLCommon.cmake
index 410766e..9158e98 100644
--- a/linden/indra/cmake/LLCommon.cmake
+++ b/linden/indra/cmake/LLCommon.cmake
@@ -12,4 +12,15 @@ set(LLCOMMON_INCLUDE_DIRS
     ${Boost_INCLUDE_DIRS}
     )
 
-set(LLCOMMON_LIBRARIES llcommon)
+# Files that need PIC code (pluginAPI) need to set REQUIRE_PIC on 64bit systems
+# this will link against a llcommon built with Position Independent Code
+# this is a requirment to link a static library (.a) to a DSO on 64 bit systems
+
+if(REQUIRE_PIC)
+        set(LLCOMMON_LIBRARIES llcommonPIC)
+else(REQUIRE_PIC)
+        set(LLCOMMON_LIBRARIES llcommon)
+endif(REQUIRE_PIC)
+
+#force clear the flag, files that need this must explicity set it themselves
+set(REQUIRE_PIC 0)
\ No newline at end of file