[cig-commits] commit:

[Mercurial]

changeset:   43:c44816e5dd68
user:        LukeHodkinson
date:        Mon Mar 03 06:35:43 2008 +0000
files:       config/SConfig/Package.py
description:
Enabling use of 64 bit library directories.


diff -r 895681059dcd -r c44816e5dd68 config/SConfig/Package.py
--- a/config/SConfig/Package.py	Mon Mar 03 06:34:30 2008 +0000
+++ b/config/SConfig/Package.py	Mon Mar 03 06:35:43 2008 +0000
@@ -9,6 +9,10 @@ class Package(object):
 
         # Setup some system specific information.
         self.system = platform.system()
+        if platform.architecture()[0].find('64') != -1:
+            self.bits = 64
+        else:
+            self.bits = 32
 
         # Is this package essential?
         self.required          = required
@@ -81,6 +85,8 @@ class Package(object):
         if self.system in ['Darwin', 'Linux']:
             self.base_dirs = ['/usr', '/usr/local']
             self.sub_dirs = [[['include'], ['lib']]]
+            if self.bits == 64:
+                self.sub_dirs = [[['include'], ['lib64']]] + self.sub_dirs
 
         # Set Darwin specific defaults.
         if self.system == 'Darwin':