actually pass the environement

th0114nd · Oct 28, 2016 · d98f1ab · d98f1ab
1 parent b67c63d
commit d98f1ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/_setuplibuv.py b/_setuplibuv.py
@@ -70,7 +70,7 @@ def prepare_windows_env(env):
     # Try if `python` on PATH is the right one. If we would execute
     # `python` directly the current executable might be used so we
     # delegate this to cmd.
-    cmd = ['cmd.exe', '/C',  'python', '-c', 'import sys; '
+    cmd = ['cmd.exe', '/C', 'python', '-c', 'import sys; '
            'v = str(sys.version_info[:2]); sys.stdout.write(v); '
            'sys.stdout.flush()']
     try:
@@ -118,15 +118,18 @@ def configure_libuv(_bext, _ext):
     def build_libuv():
         cflags = '-fPIC'
         env = os.environ.copy()
-        env['CFLAGS'] = ' '.join(x for x in (cflags, env.get('CFLAGS', None), env.get('ARCHFLAGS', None)) if x)
+        env['CFLAGS'] = ' '.join(x for x in (cflags,
+                                             env.get('CFLAGS', None),
+                                             env.get('ARCHFLAGS', None))
+                                 if x)
         # Since we're building a static library, if link-time-optimization is requested, it
         # results in failure to properly create the library archive. This goes unnoticed on
         # OS X until import time because of '-undefined dynamic_lookup'. On the raspberry
         # pi, it causes the linker to crash
         if '-flto' in env['CFLAGS']:
             log.info("Removing LTO")
             env['CFLAGS'] = env['CFLAGS'].replace('-flto', '')
-        log.info('Building libuv...')
+        log.info('Building libuv with cflags %s', env['CFLAGS'])
         if WIN:
             prepare_windows_env(env)
             libuv_arch = {'32bit': 'x86', '64bit': 'x64'}[platform.architecture()[0]]

diff --git a/_setuputils.py b/_setuputils.py
@@ -134,7 +134,7 @@ def _system(cmd, cwd=None, env=None):
 
 
 def system(cmd, cwd=None, env=None):
-    if _system(cmd, cwd=cwd, env=None):
+    if _system(cmd, cwd=cwd, env=env):
         sys.exit(1)
 
 

diff --git a/deps/libuv/vcbuild.bat b/deps/libuv/vcbuild.bat
@@ -1,4 +1,4 @@
-@echo off
+@rem @echo off
 
 cd %~dp0