| Alexander Afanasyev | 7009a6b | 2013-04-23 13:50:51 -0700 | [diff] [blame] | 1 | --- SConstruct.orig 2013-03-15 13:59:55.000000000 -0500 |
| 2 | +++ SConstruct 2013-03-20 03:41:22.000000000 -0500 |
| 3 | @@ -491,20 +491,9 @@ |
| 4 | darwin = True |
| 5 | platform = "osx" # prettier than darwin |
| 6 | |
| 7 | - if env["CXX"] is None: |
| 8 | - if os.path.exists( "/usr/bin/g++-4.2" ): |
| 9 | - env["CXX"] = "g++-4.2" |
| 10 | - |
| 11 | nix = True |
| 12 | |
| 13 | - if force64: |
| 14 | - env.Append( EXTRACPPPATH=["/usr/64/include"] ) |
| 15 | - env.Append( EXTRALIBPATH=["/usr/64/lib"] ) |
| 16 | - if installDir == DEFAULT_INSTALL_DIR: |
| 17 | - installDir = "/usr/64/" |
| 18 | - else: |
| 19 | - env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) ) |
| 20 | - env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) ) |
| 21 | + env.MergeFlags( [ os.getenv("CPPFLAGS"), os.getenv("LDFLAGS"), os.getenv("ARCHFLAGS") ] ) |
| 22 | |
| 23 | elif os.sys.platform.startswith("linux"): |
| 24 | linux = True |