daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use conf.fatal() instead of fatal() in order to abort the configure script

pull/22966/head
Simon Cornelius P. Umacob 2009-12-09 20:36:12 +08:00 committed by Ryan Dahl
parent a73227bf28
commit e801f420d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wscript
View File

@ -83,7 +83,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
def conf_subproject (conf, subdir, command=None): def conf_subproject (conf, subdir, command=None):
print("---- %s ----" % subdir) print("---- %s ----" % subdir)
src = join(conf.srcdir, subdir) src = join(conf.srcdir, subdir)
if not os.path.exists (src): fatal("no such subproject " + subdir) if not os.path.exists (src): conf.fatal("no such subproject " + subdir)
default_tgt = join(conf.blddir, "default", subdir) default_tgt = join(conf.blddir, "default", subdir)
@ -92,7 +92,7 @@ def conf_subproject (conf, subdir, command=None):
if command: if command:
if os.system("cd %s && %s" % (default_tgt, command)) != 0: if os.system("cd %s && %s" % (default_tgt, command)) != 0:
fatal("Configuring %s failed." % (subdir)) conf.fatal("Configuring %s failed." % (subdir))
debug_tgt = join(conf.blddir, "debug", subdir) debug_tgt = join(conf.blddir, "debug", subdir)
@ -117,7 +117,7 @@ def configure(conf):
if not conf.check(lib="execinfo", libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"): if not conf.check(lib="execinfo", libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
if sys.platform.startswith("freebsd"): if sys.platform.startswith("freebsd"):
fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.") conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
if conf.check_cfg(package='gnutls', if conf.check_cfg(package='gnutls',
args='--cflags --libs', args='--cflags --libs',