Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
senf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wiback
senf
Commits
a499af94
Commit
a499af94
authored
15 years ago
by
g0dil
Browse files
Options
Downloads
Patches
Plain Diff
Fix SCons 1.2.0 build failure
parent
b1a93bd8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
site_scons/site_tools/Boost.py
+8
-3
8 additions, 3 deletions
site_scons/site_tools/Boost.py
with
8 additions
and
3 deletions
site_scons/site_tools/Boost.py
+
8
−
3
View file @
a499af94
...
...
@@ -89,11 +89,10 @@ def BoostUnitTest(env, target=None, source=None, **kw):
**
kw
)
stamp
=
env
.
Command
(
stampnode
,
bin
,
[
'
$SOURCE $BOOSTTESTARGS
'
,
'
touch $TARGET
'
],
[
'
$SOURCE $BOOSTTESTARGS
'
,
SCons
.
Script
.
Touch
(
'
$TARGET
'
)],
**
kw
)
alias
=
env
.
Command
(
env
.
File
(
target
),
stamp
,
[
]
)
alias
=
env
.
Command
(
env
.
File
(
target
),
stamp
,
[
env
.
NopAction
()
]
)
compileTests
=
[
src
for
src
in
source
if
src
.
suffix
in
SCons
.
Tool
.
cplusplus
.
CXXSuffixes
\
...
...
@@ -109,6 +108,11 @@ def BoostUnitTest(env, target=None, source=None, **kw):
def
FindAllBoostUnitTests
(
env
,
target
,
source
):
return
_ALL_TESTS
def
NopAction
(
env
,
target
,
source
):
def
nop
(
target
,
source
,
env
)
:
return
None
def
nopstr
(
target
,
source
,
env
)
:
return
''
return
env
.
Action
(
nop
,
nopstr
)
def
generate
(
env
):
env
.
SetDefault
(
BOOST_VARIANT
=
''
,
...
...
@@ -131,6 +135,7 @@ def generate(env):
source_scanner
=
SCons
.
Scanner
.
C
.
CScanner
(),
single_source
=
1
)
env
[
'
BUILDERS
'
][
'
NopAction
'
]
=
NopAction
def
exists
(
env
):
return
True
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment