30 lines
1 KiB
Text
30 lines
1 KiB
Text
|
Index: SConstruct
|
||
|
|
--- SConstruct.orig
|
||
|
|
+++ SConstruct
|
||
|
|
@@ -93,7 +93,7 @@ def make_variant_dir_generator():
|
||
|
|
|
||
|
|
# Always randomize the build order to shake out missing edges, and to help the cache:
|
||
|
|
# http://scons.org/doc/production/HTML/scons-user/ch24s06.html
|
||
|
|
-SetOption('random', 1)
|
||
|
|
+#SetOption('random', 1)
|
||
|
|
|
||
|
|
# Options TODOs:
|
||
|
|
#
|
||
|
|
@@ -1196,6 +1196,7 @@ envDict = dict(BUILD_ROOT=buildDir,
|
||
|
|
CONFIGURELOG='$BUILD_ROOT/scons/config.log',
|
||
|
|
CONFIG_HEADER_DEFINES={},
|
||
|
|
LIBDEPS_TAG_EXPANSIONS=[],
|
||
|
|
+ ENV = {'PATH': os.environ['PATH']},
|
||
|
|
)
|
||
|
|
|
||
|
|
# TODO: Remove these when hygienic builds are default.
|
||
|
|
@@ -3459,7 +3460,7 @@ def doConfigure(myenv):
|
||
|
|
sslLibName = "ssl"
|
||
|
|
cryptoLibName = "crypto"
|
||
|
|
sslLinkDependencies = ["crypto", "dl"]
|
||
|
|
- if conf.env.TargetOSIs('freebsd'):
|
||
|
|
+ if conf.env.TargetOSIs('freebsd') or conf.env.TargetOSIs('openbsd'):
|
||
|
|
sslLinkDependencies = ["crypto"]
|
||
|
|
|
||
|
|
if conf.env.TargetOSIs('windows'):
|