From 9f56c80b364b1ce0eb3650933cda76857568af60 Mon Sep 17 00:00:00 2001 From: Paulo Alves Date: Thu, 29 Sep 2016 15:39:34 -0300 Subject: [PATCH 1/2] Fix build Python Port on Ubuntu x64 --- src/engine/build.jam | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/engine/build.jam b/src/engine/build.jam index e16b240859..dd7d90e3b7 100644 --- a/src/engine/build.jam +++ b/src/engine/build.jam @@ -97,6 +97,10 @@ if $(with-python) { local inc = [ GLOB [ .path $(python-location) include ] : python$(v) ] ; local lib = [ GLOB [ .path $(python-location) lib ] : libpython$(v)* ] ; + if ! $(lib) + { + lib = [ GLOB [ .path $(python-location) lib x86_64-linux-gnu ] : libpython$(v)* ] ; + } if $(inc) && $(lib) { --python-include ?= $(inc) ; From 841b9db480138dbb82109b71e12a6e6259db017f Mon Sep 17 00:00:00 2001 From: Paulo Alves Date: Thu, 29 Sep 2016 15:43:07 -0300 Subject: [PATCH 2/2] Code shortened --- src/engine/build.jam | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/engine/build.jam b/src/engine/build.jam index dd7d90e3b7..5ae47d29c8 100644 --- a/src/engine/build.jam +++ b/src/engine/build.jam @@ -97,10 +97,7 @@ if $(with-python) { local inc = [ GLOB [ .path $(python-location) include ] : python$(v) ] ; local lib = [ GLOB [ .path $(python-location) lib ] : libpython$(v)* ] ; - if ! $(lib) - { - lib = [ GLOB [ .path $(python-location) lib x86_64-linux-gnu ] : libpython$(v)* ] ; - } + lib ?= [ GLOB [ .path $(python-location) lib x86_64-linux-gnu ] : libpython$(v)* ] ; if $(inc) && $(lib) { --python-include ?= $(inc) ;