Small additional fixes

joelagnel · Sep 20, 2023 · 242d85d · 242d85d
1 parent 8fddf39
commit 242d85d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/addons/run.common b/addons/run.common
@@ -20,6 +20,10 @@ do_mounts()
  mount --bind /sys/kernel/tracing/ debian/sys/kernel/tracing/
  fi
 
+ if [ -d /sys/kernel/debug/tracing ]; then
+ mount --bind /sys/kernel/debug/tracing/ debian/sys/kernel/debug/tracing/
+ fi
+
  # Mount Android partitions
  if [ -d /d/ ]; then
  if [ ! -d debian/d ]; then ln -s /sys/kernel/debug debian/d; fi
@@ -53,3 +57,6 @@ do_mounts()
 
 mount | grep debian > /dev/null
 if [ $? -ne 0 ]; then do_mounts; fi
+
+# unset any PRELOAD in Android environment, otherwise Linux linker cann't handle it.
+unset LD_PRELOAD
diff --git a/bcc/misc/build-bcc-minimal/build-on-target.sh b/bcc/misc/build-bcc-minimal/build-on-target.sh
@@ -3,6 +3,6 @@
 
 cd bcc-master
 rm -rf build && mkdir -p build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=./future-usr -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7
+cmake .. -DCMAKE_INSTALL_PREFIX=./future-usr -DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11
 make -j90
 make install
diff --git a/packages/tracers b/packages/tracers
@@ -2,4 +2,6 @@ PACKAGES+="\
 linux-perf
 trace-cmd
 strace
+sshfs
+bpfcc-tools
 "