aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-04-12 10:33:33 -0400
committerJack Lloyd <[email protected]>2018-04-12 10:33:33 -0400
commit6a9557cc5528ec01737e77b67959cba8778f1265 (patch)
treed5b730d6ed8ae85812acd9ded7549e9c0ad3b0e8
parent59012b91d50485bd5aa7d700fdcf40347239ec93 (diff)
Lint fixes
-rwxr-xr-xconfigure.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.py b/configure.py
index f5e06afef..26a5ba8a2 100755
--- a/configure.py
+++ b/configure.py
@@ -1789,6 +1789,11 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
return path
return os.path.join(build_dir, path)
+ def shared_lib_uses_symlinks():
+ if options.os in ['windows', 'openbsd']:
+ return False
+ return True
+
variables = {
'version_major': Version.major(),
'version_minor': Version.minor(),
@@ -1848,11 +1853,11 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'),
'build_static_lib': options.build_static_lib,
+ 'build_shared_lib': options.build_shared_lib,
+
'build_fuzzers': options.build_fuzzers,
- 'build_shared_lib': options.build_shared_lib,
- 'build_shared_lib': options.build_shared_lib,
- 'symlink_shared_lib': options.build_shared_lib and options.compiler != 'msvc' and options.os != 'openbsd',
+ 'symlink_shared_lib': options.build_shared_lib and shared_lib_uses_symlinks(),
'libobj_dir': build_paths.libobj_dir,
'cliobj_dir': build_paths.cliobj_dir,