Skip to content

Commit c972449

Browse files
committed
build: (workaround for nsnam#16) Make Waf default to Python 3
1 parent 74ec793 commit c972449

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

waf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# encoding: latin-1
33
# Thomas Nagy, 2005-2018
44
#

wscript

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,6 @@ def configure(conf):
368368

369369
env = conf.env
370370

371-
# ns-3 now only supports Python3 but Waf is based on Python2
372-
# This can be removed once Waf moves to Python3
373-
if Options.options.with_python is None:
374-
if sys.version_info < (3,):
375-
# Forcing otherwise unused Options.options.python to select python3
376-
# This option is checked later by waflib
377-
Options.options.python = 'python3'
378-
conf.msg('Configuring Waf to use python3: ', Options.options.python, 'GREEN')
379-
380371
if Options.options.enable_gcov:
381372
env['GCOV_ENABLED'] = True
382373
env.append_value('CCFLAGS', '-fprofile-arcs')

0 commit comments

Comments
 (0)