[jhbuild] win32: import the required module to avoid an assertion
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] win32: import the required module to avoid an assertion
- Date: Wed, 20 Aug 2014 17:17:57 +0000 (UTC)
commit ce25bb0012965dde44a3b07e5eb0a657eef43b0f
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Wed Aug 20 19:17:12 2014 +0200
win32: import the required module to avoid an assertion
jhbuild/environment.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/environment.py b/jhbuild/environment.py
index 7633507..095269b 100644
--- a/jhbuild/environment.py
+++ b/jhbuild/environment.py
@@ -25,11 +25,14 @@ import os
from jhbuild.errors import FatalError, CommandError
from jhbuild.utils.cmds import get_output
+if sys.platform.startswith('win'):
+ from jhbuild.utils import subprocess_win32
+
def addpath(envvar, path):
'''Adds a path to an environment variable.'''
if envvar in [ 'LDFLAGS', 'CFLAGS', 'CXXFLAGS' ]:
if sys.platform.startswith('win'):
- path = jhbuild.utils.subprocess_win32.fix_path_for_msys(path)
+ path = subprocess_win32.fix_path_for_msys(path)
envval = os.environ.get(envvar)
if envval:
@@ -47,7 +50,7 @@ def addpath(envvar, path):
else:
pathsep = ':'
if sys.platform.startswith('win'):
- path = jhbuild.utils.subprocess_win32.fix_path_for_msys(path)
+ path = subprocess_win32.fix_path_for_msys(path)
if sys.platform.startswith('win') and len(path) > 1 and \
path[1] == ':':
@@ -128,7 +131,7 @@ def setup_env(prefix):
# This path doesn't always get passed to addpath so we fix it here
if sys.platform.startswith('win'):
- libdir = jhbuild.utils.subprocess_win32.fix_path_for_msys(libdir)
+ libdir = subprocess_win32.fix_path_for_msys(libdir)
os.environ['LDFLAGS'] = ('-L%s ' % libdir) + os.environ.get('LDFLAGS', '')
includedir = os.path.join(prefix, 'include')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]