Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
praich
Ns 3 Dev
Commits
c972449f
Commit
c972449f
authored
5 years ago
by
Tom Henderson
Browse files
Options
Download
Email Patches
Plain Diff
build: (workaround for #16) Make Waf default to Python 3
parent
74ec7930
master
6LoFD
IoT2021
dl-mpl
lr-wpan-energy
medley-rebase
medley-test
medley6-temp
rel-mc
rpl
unif-cons
ns-3.33
ns-3.32
ns-3.31
ns-3.30.1
ns-3.30
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
waf
+1
-1
waf
wscript
+0
-9
wscript
with
1 addition
and
10 deletions
+1
-10
waf
View file @
c972449f
#!/usr/bin/env python
#!/usr/bin/env python
3
# encoding: latin-1
# Thomas Nagy, 2005-2018
#
...
...
This diff is collapsed.
Click to expand it.
wscript
View file @
c972449f
...
...
@@ -368,15 +368,6 @@ def configure(conf):
env
=
conf
.
env
# ns-3 now only supports Python3 but Waf is based on Python2
# This can be removed once Waf moves to Python3
if
Options
.
options
.
with_python
is
None
:
if
sys
.
version_info
<
(
3
,):
# Forcing otherwise unused Options.options.python to select python3
# This option is checked later by waflib
Options
.
options
.
python
=
'python3'
conf
.
msg
(
'Configuring Waf to use python3: '
,
Options
.
options
.
python
,
'GREEN'
)
if
Options
.
options
.
enable_gcov
:
env
[
'GCOV_ENABLED'
]
=
True
env
.
append_value
(
'CCFLAGS'
,
'-fprofile-arcs'
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help