From 42d270870e6bd9f0ae29803f18fcdcb038cf1255 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 13 Jan 2019 16:45:39 -0800 Subject: [PATCH] Fix C++ example Makefile for cross-compilation (#67) CXX can't be conditional. --- stage2/01-sys-tweaks/01-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 362d312..cd8e425 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -150,7 +150,7 @@ rm -rf /tmp/java-multiCameraServer # also update Makefile to use cross-compiler and point to local dependencies rm -rf /tmp/cpp-multiCameraServer mkdir -p /tmp/cpp-multiCameraServer -echo "CXX?=arm-raspbian9-linux-gnueabihf-g++" > /tmp/cpp-multiCameraServer/Makefile +echo "CXX=arm-raspbian9-linux-gnueabihf-g++" > /tmp/cpp-multiCameraServer/Makefile sed -e 's/\/usr\/local\/frc\///g' ${ROOTFS_DIR}/home/pi/examples/cpp-multiCameraServer/Makefile >> /tmp/cpp-multiCameraServer/Makefile sh -c "cd ${ROOTFS_DIR}/usr/local/frc && tar cf - lib include" | sh -c "cd /tmp/cpp-multiCameraServer && tar xf -" sh -c "cd /tmp && zip -r ${ROOTFS_DIR}/home/pi/zips/cpp-multiCameraServer.zip cpp-multiCameraServer --exclude \*.so.\*"