From f3eff67e817d0e2df52f47cbfcdce30e8925eae5 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 17 Jun 2019 15:23:03 -0700 Subject: [PATCH] Deterministic boardd build (#702) old-commit-hash: fe7e5cf5df84257e4929516dd0f357488fd5524a --- selfdrive/boardd/Makefile | 2 +- selfdrive/boardd/can_list_to_can_capnp.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/selfdrive/boardd/Makefile b/selfdrive/boardd/Makefile index 7bd22add3..18d057109 100644 --- a/selfdrive/boardd/Makefile +++ b/selfdrive/boardd/Makefile @@ -80,7 +80,7 @@ boardd_api_impl.so: libcan_list_to_can_capnp.a boardd_api_impl.pyx boardd_setup. rm -f boardd_api_impl.cpp libcan_list_to_can_capnp.a: can_list_to_can_capnp.o $(CEREAL_OBJS) - ar rcs '$@' $^ + ar rcsD '$@' $^ %.o: %.c @echo "[ CC ] $@" diff --git a/selfdrive/boardd/can_list_to_can_capnp.cc b/selfdrive/boardd/can_list_to_can_capnp.cc index 626c1e2a9..385047410 100644 --- a/selfdrive/boardd/can_list_to_can_capnp.cc +++ b/selfdrive/boardd/can_list_to_can_capnp.cc @@ -21,12 +21,12 @@ void can_list_to_can_capnp_cpp(const std::vector &can_list, std::stri event.setLogMonoTime(nanos_since_boot()); auto canData = sendCan ? event.initSendcan(can_list.size()) : event.initCan(can_list.size()); - int i = 0; - for (auto it = can_list.begin(); it != can_list.end(); it++, i++) { - canData[i].setAddress(it->address); - canData[i].setBusTime(it->busTime); - canData[i].setDat(kj::arrayPtr((uint8_t*)it->dat.data(), it->dat.size())); - canData[i].setSrc(it->src); + int j = 0; + for (auto it = can_list.begin(); it != can_list.end(); it++, j++) { + canData[j].setAddress(it->address); + canData[j].setBusTime(it->busTime); + canData[j].setDat(kj::arrayPtr((uint8_t*)it->dat.data(), it->dat.size())); + canData[j].setSrc(it->src); } auto words = capnp::messageToFlatArray(msg); auto bytes = words.asBytes();