Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

if WX_CONFIG is set in the environment then use that instead of defaulting to "wx-config"

Browse Source
This commit is contained in:
Robin Dunn
2020-03-20 15:25:34 -07:00
parent 8e2627e8e3
commit 9b122237c9
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build.py
View File

@@ -1573,13 +1573,16 @@ def cmd_build_py(options, args):
os.environ['WXPYTHON_RELEASE'] = 'yes'
if not isWindows:
WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
if options.use_syswx:
wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
if options.prefix and os.path.exists(wxcfg):
WX_CONFIG = wxcfg
else:
WX_CONFIG = 'wx-config' # hope it is on the PATH
if 'WX_CONFIG' in os.environ:
WX_CONFIG = os.environ['WX_CONFIG']
else:
WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
if options.use_syswx:
wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
if options.prefix and os.path.exists(wxcfg):
WX_CONFIG = wxcfg
else:
WX_CONFIG = 'wx-config' # hope it is on the PATH
wafBuildBase = wafBuildDir = getWafBuildBase()

5
buildtools/config.py
View File

@@ -400,7 +400,10 @@ class Configuration(object):
"""
# if WX_CONFIG hasn't been set to an explicit value then construct one.
if self.WX_CONFIG is None:
self.WX_CONFIG='wx-config'
if 'WX_CONFIG' in os.environ:
self.WX_CONFIG = os.environ['WX_CONFIG']
else:
self.WX_CONFIG='wx-config'
port = self.WXPORT
if port == "x11":
port = "x11univ"