FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

xsubpp misconfiguration on redhat systems

This commit is contained in:
Thomas Nagy 2015-04-11 10:51:19 +02:00
parent 0c0e0388a0
commit ba7295d555
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
waflib/Tools/perl.py
View File

@ -63,7 +63,6 @@ def check_perl_version(self, minver=None):
minver is supposed to be a tuple
"""
res = True
if minver:
cver = '.'.join(map(str,minver))
else:
@ -75,11 +74,10 @@ def check_perl_version(self, minver=None):
if not perl:
perl = self.find_program('perl', var='PERL')
if not perl:
self.end_msg("Perl not found", color="YELLOW")
return False
self.env['PERL'] = perl
version = self.cmd_and_log(self.env.PERL + ["-e", 'printf \"%vd\", $^V'])
@ -141,9 +139,14 @@ def check_perl_ext_devel(self):
env['LINKFLAGS_PERLEXT'] = cfg_lst('$Config{lddlflags}')
env['INCLUDES_PERLEXT'] = cfg_lst('$Config{archlib}/CORE')
env['CFLAGS_PERLEXT'] = cfg_lst('$Config{ccflags} $Config{cccdlflags}')
env['XSUBPP'] = cfg_lst('$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}')
env['XSUBPP'] = xsubpp = cfg_lst('$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}')
env['EXTUTILS_TYPEMAP'] = cfg_lst('$Config{privlib}/ExtUtils/typemap')
if len(xsubpp) == 1 and not os.path.isfile(xsubpp[0]):
# oh Fedora
env.XSUBPP = []
self.find_program('xsubpp')
if not getattr(Options.options, 'perlarchdir', None):
env['ARCHDIR_PERL'] = cfg_str('$Config{sitearch}')
else: