From 933f92684f7c6c106ecd730fbf34e18bf94c8388 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 26 Apr 2013 16:48:23 +0000 Subject: [PATCH] revert part of last change, run configure from the builddir or cwd, not from configure's location. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/tools/builder.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/tools/builder.py b/build/tools/builder.py index c69d26ab10..4087cf53b3 100755 --- a/build/tools/builder.py +++ b/build/tools/builder.py @@ -153,10 +153,13 @@ class AutoconfBuilder(GNUMakeBuilder): def __init__(self, formatName="autoconf"): GNUMakeBuilder.__init__(self, formatName=formatName) - def configure(self, dir=None, options=[]): - if not dir: - dir = os.getcwd() + def configure(self, dir=None, options=None): + #olddir = os.getcwd() + #os.chdir(dir) + configdir = dir + if not dir: + configdir = os.getcwd() configure_cmd = "" while os.path.exists(configdir): @@ -175,14 +178,11 @@ class AutoconfBuilder(GNUMakeBuilder): sys.stderr.write("Could not find configure script at %r. Have you run autoconf?\n" % dir) return 1 - olddir = os.getcwd() - os.chdir(configdir) - optionsStr = " ".join(options) if options else "" - command = "./configure %s" % optionsStr + command = "%s %s" % (configure_cmd, optionsStr) print(command) result = os.system(command) - os.chdir(olddir) + #os.chdir(olddir) return result -- 2.45.2