summaryrefslogtreecommitdiff
path: root/boostcpp.jam
diff options
context:
space:
mode:
authorMichael Caisse <mcaisse@ciere.com>2019-06-26 08:18:11 -0700
committerPeter Dimov <pdimov@gmail.com>2020-02-24 19:50:19 +0200
commitc186a9b36fc1535f06ee0231437844cc29af1f2b (patch)
tree4513bedc24f4a0620f43384ca6dd73a338cae56b /boostcpp.jam
parentaec204aa04266672c33d43169978640b398ffc76 (diff)
downloadboost-c186a9b36fc1535f06ee0231437844cc29af1f2b.tar.gz
missed the s390x project when fixing conflict
Diffstat (limited to 'boostcpp.jam')
-rw-r--r--boostcpp.jam1
1 files changed, 1 insertions, 0 deletions
diff --git a/boostcpp.jam b/boostcpp.jam
index 1ce5a51f7a..299401778d 100644
--- a/boostcpp.jam
+++ b/boostcpp.jam
@@ -624,6 +624,7 @@ rule deduce-architecture ( properties * )
: /boost/architecture//mips1
: /boost/architecture//power
: /boost/architecture//riscv
+ : /boost/architecture//s390x
: /boost/architecture//sparc
: /boost/architecture//x86
: /boost/architecture//combined ] ;