Skip to content

Commit 8c8b0dc

Browse files
committed
Only boost-install boost_numpy when it's being built
1 parent fdc9ec7 commit 8c8b0dc

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

build/Jamfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ else
3030
;
3131
}
3232

33-
if [ python.configured ]
34-
{
3533
project boost/python
3634
: source-location ../src
3735
;
@@ -123,7 +121,7 @@ lib boost_numpy
123121
<library>boost_python
124122
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
125123
-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
126-
<tag>@$(__name__).python-tag
124+
<tag>@$(__name__).python-tag
127125
<conditional>@python.require-py
128126

129127
: # default build
@@ -142,8 +140,16 @@ lib boost_numpy
142140
# `install` installs the two libraries and their dependencies and is similar
143141
# to issuing `b2 --with-python install` from top level
144142

145-
boost-install boost_python boost_numpy ;
146-
143+
if [ python.configured ]
144+
{
145+
if [ python.numpy ]
146+
{
147+
boost-install boost_python boost_numpy ;
148+
}
149+
else
150+
{
151+
boost-install boost_python ;
152+
}
147153
}
148154
else
149155
{

0 commit comments

Comments
 (0)