diff options
Diffstat (limited to 'cpp/newmakebindist.py')
| -rwxr-xr-x | cpp/newmakebindist.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index 8179921abc8..bd94832ad7f 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -709,12 +709,6 @@ def usage(): def main(): buildEnvironment = dict() - environmentDefaults = dict([ - ("BZIP2_HOME", "/opt/bzip2"), - ("DB_HOME", "/opt/db"), - ("OPENSSL_HOME", "/opt/openssl"), - ("EXPAT_HOME", "/opt/expat") - ]) buildDir = None installDir = None sources = None @@ -781,15 +775,8 @@ def main(): # # Configure environment. # - for k, v in environmentDefaults.iteritems(): - if buildEnvironment.has_key(k): - os.environ[k] = buildEnvironment[k] - # - # We pick up defaults for non-linux platforms only. Our binary build platform is Linux and should - # come with all of the required packages installed in 'system' locations. - # - elif not os.environ.has_key(k) and getPlatform() <> "linux": - os.environ[k] = v + for k, v in buildEnvironment.iteritems(): + os.environ[k] = buildEnvironment[k] if buildDir == None: logging.info("No build directory specified, defaulting to $HOME/tmp/icebuild") |