commit f23a05aff08c547c97073c03b310882c386cf05d
author Austin Schuh <austin.linux@gmail.com> Thu Feb 24 18:11:23 2022 -0800
committer Austin Schuh <austin.linux@gmail.com> Fri Feb 25 22:01:29 2022 -0800
tree 6e0443f92fae0fd32a0bce99109fa8be962ab2aa
parent 31aa4b1d03394e97c04281acbaeb65218283ecdb

Switch to adding ./ to rpath to find CTRE code

This makes the startup scripts simpler.

Change-Id: Ida099eb1fd6a16c4f146f5e55e8c1ca1665fbbde
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/starter/starter.sh

diff --git a/aos/starter/starter.sh b/aos/starter/starter.sh
index ff210dc..9bc7605 100755
--- a/aos/starter/starter.sh
+++ b/aos/starter/starter.sh
@@ -6,12 +6,7 @@
   /usr/local/natinst/etc/init.d/systemWebServer stop
 
   ROBOT_CODE="/home/admin/bin"
-
-  # Get the CTRE libraries in the shared library search path
-  for f in $(ls *.so);
-  do
-    ln -f -s /home/admin/bin/$f /usr/local/frc/third-party/lib/$f
-  done
+  cd "${ROBOT_CODE}"
 
   ln -s /var/local/natinst/log/FRC_UserProgram.log /tmp/FRC_UserProgram.log
   ln -s /var/local/natinst/log/FRC_UserProgram.log "${ROBOT_CODE}/FRC_UserProgram.log"

third_party/BUILD

diff --git a/third_party/BUILD b/third_party/BUILD
index cff81fd..8dbb529 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -24,6 +24,10 @@
 
 cc_library(
     name = "phoenix",
+    linkopts = [
+        "-Wl,-rpath",
+        "-Wl,.",
+    ],
     target_compatible_with = ["//tools/platforms/hardware:roborio"],
     visibility = ["//visibility:public"],
     deps = [