diff options
| author | Mathias Stearn <redbeard0531@gmail.com> | 2009-10-12 14:20:52 -0400 |
|---|---|---|
| committer | Mathias Stearn <redbeard0531@gmail.com> | 2009-10-12 14:20:52 -0400 |
| commit | 42544bd9af00e2153b5ca49faa2b370dad5dd804 (patch) | |
| tree | 5616990912efae0af7c0f62f6eac46f3882d52d9 /buildscripts | |
| parent | c7f0a55ee5eac6e1a3d1d10c43656b5c5e0ec68b (diff) | |
| download | mongo-42544bd9af00e2153b5ca49faa2b370dad5dd804.tar.gz | |
support xulrunner on Arch Linux
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/__init__.py | 4 | ||||
| -rw-r--r-- | buildscripts/hacks_ubuntu.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/buildscripts/__init__.py b/buildscripts/__init__.py index 9193b6cc728..7f1b703442e 100644 --- a/buildscripts/__init__.py +++ b/buildscripts/__init__.py @@ -3,6 +3,8 @@ import hacks_ubuntu import os; def findHacks( un ): - if un[0] == 'Linux' and ( os.path.exists( "/etc/debian_version" ) or un[3].find( "Ubuntu" ) >= 0 ): + if un[0] == 'Linux' and (os.path.exists("/etc/debian_version") or + os.path.exists("/etc/arch-release") or + un[3].find("Ubuntu") >= 0): return hacks_ubuntu return None diff --git a/buildscripts/hacks_ubuntu.py b/buildscripts/hacks_ubuntu.py index 18b14023594..9ae72a85db5 100644 --- a/buildscripts/hacks_ubuntu.py +++ b/buildscripts/hacks_ubuntu.py @@ -25,9 +25,10 @@ def foundxulrunner( env , options ): incroot = "/usr/include/" + best + "/" libroot = "/usr/lib" - if options["linux64"]: + if options["linux64"] and os.path.exists("/usr/lib64"): libroot += "64"; libroot += "/" + best + if not os.path.exists( libroot ): print( "warning: found xulrunner include but not lib for: " + best ) |