From e27ebcd97a4b1f546e05f9d0c7d43ac97f9b9c19 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Mon, 24 Oct 2016 12:27:46 -0700 Subject: [PATCH] Upgrade libsass to 3.3.6 - Disable debug symbols under msvc to avoid buggy /DEBUG mode - Remove python2.6 msvc monkeypatch - Update libsass submodule to 3.3.6 --- libsass | 2 +- setup.py | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/libsass b/libsass index dad30227..3ae9a206 160000 --- a/libsass +++ b/libsass @@ -1 +1 @@ -Subproject commit dad30227fd3e6203a268bdd2901e9c4e2eec1f0b +Subproject commit 3ae9a2066152f9438aebaaacd12f39deaceaebc2 diff --git a/setup.py b/setup.py index 0eca5b7f..1b57d23c 100644 --- a/setup.py +++ b/setup.py @@ -81,20 +81,7 @@ if get_build_version() < 14.0: msvc9compiler.get_build_version = lambda: 14.0 msvc9compiler.VERSION = 14.0 - # Workaround http://bugs.python.org/issue4431 under Python <= 2.6 - if sys.version_info < (2, 7): - def spawn(self, cmd): - from distutils.spawn import spawn - if cmd[0] == self.linker: - for i, val in enumerate(cmd): - if val.startswith('/MANIFESTFILE:'): - spawn(cmd[:i] + ['/MANIFEST'] + cmd[i:], - dry_run=self.dry_run) - return - spawn(cmd, dry_run=self.dry_run) - from distutils.msvc9compiler import MSVCCompiler - MSVCCompiler.spawn = spawn - flags = ['-c', '-O2', '/EHsc', '/MT'] + flags = ['/Od', '/EHsc', '/MT'] link_flags = [] else: flags = [