Commit 16a7d681 by plusvic

Fix some small issues in setup.py

parent 43436768
...@@ -69,8 +69,8 @@ class BuildCommand(build): ...@@ -69,8 +69,8 @@ class BuildCommand(build):
user_options = build.user_options + [ user_options = build.user_options + [
('dynamic-linking', None,'link dynamically against libyara'), ('dynamic-linking', None,'link dynamically against libyara'),
('enable-cuckoo', None,'enable "cuckoo" module (use with --static)'), ('enable-cuckoo', None,'enable "cuckoo" module'),
('enable-magic', None,'enable "magic" module (use with --static)'), ('enable-magic', None,'enable "magic" module'),
('enable-profiling', None,'enable profiling features')] ('enable-profiling', None,'enable profiling features')]
boolean_options = build.boolean_options + [ boolean_options = build.boolean_options + [
...@@ -85,10 +85,10 @@ class BuildCommand(build): ...@@ -85,10 +85,10 @@ class BuildCommand(build):
def finalize_options(self): def finalize_options(self):
build.finalize_options(self) build.finalize_options(self)
if self.enable_magic and self.dynamic: if self.enable_magic and self.dynamic_linking:
raise distutils.errors.DistutilsOptionError( raise distutils.errors.DistutilsOptionError(
'--enable-magic can''t be used with --dynamic-linking') '--enable-magic can''t be used with --dynamic-linking')
if self.enable_cuckoo and self.dynamic: if self.enable_cuckoo and self.dynamic_linking:
raise distutils.errors.DistutilsOptionError( raise distutils.errors.DistutilsOptionError(
'--enable-cuckoo can''t be used with --dynamic-linking') '--enable-cuckoo can''t be used with --dynamic-linking')
...@@ -105,7 +105,7 @@ class BuildCommand(build): ...@@ -105,7 +105,7 @@ class BuildCommand(build):
libraries = ['yara'] libraries = ['yara']
include_dirs = [] include_dirs = []
library_dirs = [] library_dirs = []
compile_args = ['-O3'] compile_args = []
macros = [] macros = []
if self.plat_name in ('win32','win-amd64'): if self.plat_name in ('win32','win-amd64'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment