From 02225aa95c6fa2c7803a8e48769527c7462fc123 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 9 Oct 2018 14:52:38 -0700
Subject: [PATCH] Look for native programs in same directory as the current
 executable

---
 src/dynamic_program.rs | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/dynamic_program.rs b/src/dynamic_program.rs
index 9f6299ee46..d056e3e154 100644
--- a/src/dynamic_program.rs
+++ b/src/dynamic_program.rs
@@ -1,6 +1,7 @@
 extern crate elf;
 extern crate rbpf;
 
+use std::env;
 use std::io::prelude::*;
 use std::mem;
 use std::path::PathBuf;
@@ -46,28 +47,17 @@ pub enum ProgramPath {
 impl ProgramPath {
     /// Creates a platform-specific file path
     pub fn create(&self, name: &str) -> PathBuf {
-        let mut path = PathBuf::from(env!("OUT_DIR"));
-        match self {
-            ProgramPath::Bpf => {
-                //println!("Bpf");
-                path.pop();
-                path.pop();
-                path.pop();
-                path.push(PLATFORM_FILE_PREFIX_BPF.to_string() + name);
-                path.set_extension(PLATFORM_FILE_EXTENSION_BPF);
-            }
-            ProgramPath::Native => {
-                //println!("Native");
-                path.pop();
-                path.pop();
-                path.pop();
-                path.push("deps");
-                path.push(PLATFORM_FILE_PREFIX_NATIVE.to_string() + name);
-                path.set_extension(PLATFORM_FILE_EXTENSION_NATIVE);
-            }
-        }
-        //println!("Path: {:?}", path);
-        path
+        let pathbuf = {
+            let current_exe = env::current_exe().unwrap();
+            PathBuf::from(current_exe.parent().unwrap())
+        };
+
+        pathbuf.join(match self {
+            ProgramPath::Bpf => PathBuf::from(PLATFORM_FILE_PREFIX_BPF.to_string() + name)
+                .with_extension(PLATFORM_FILE_EXTENSION_BPF),
+            ProgramPath::Native => PathBuf::from(PLATFORM_FILE_PREFIX_NATIVE.to_string() + name)
+                .with_extension(PLATFORM_FILE_EXTENSION_NATIVE),
+        })
     }
 }