citrun

commit fed5f849ea26dc6046e89a95861825c04203e8e2
parent a218545029b1ea062acb274eb00e30ceef78066b
Author: kyle <kyle@0x30.net>
Date:   Sun, 29 Jan 2017 10:43:24 -0700

bin: don't use prefix.h anymore now that paths are stable

Diffstat:
M
bin/inst_fe.cc
 | 
7
++++---
M
bin/inst_feunix.cc
 | 
2
+-
M
bin/inst_fewin32.cc
 | 
2
--

3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/bin/inst_fe.cc b/bin/inst_fe.cc
@@ -16,7 +16,6 @@
 #include "inst_action.h"	// InstrumentActionFactory
 #include "inst_fe.h"
 #include "lib.h"		// citrun_major, citrun_minor
-#include "prefix.h"		// prefix
 
 #include <clang/Basic/Diagnostic.h>	// IgnoringDiagConsumer
 #include <clang/Tooling/CommonOptionsParser.h>
@@ -51,9 +50,11 @@ InstFrontend::log_identity()
 void
 InstFrontend::get_paths()
 {
-	m_compilers_path = share_dir ;
+	m_compilers_path = PREFIX ;
+	m_compilers_path += dir_sep() ;
+	m_compilers_path += "share/citrun" ;
 
-	m_lib_path = lib_dir ;
+	m_lib_path = PREFIX ;
 	m_lib_path += dir_sep();
 	m_lib_path += lib_name();
 
diff --git a/bin/inst_feunix.cc b/bin/inst_feunix.cc
@@ -40,7 +40,7 @@ InstFrontendUnix::path_sep()
 std::string
 InstFrontendUnix::lib_name()
 {
-	return "libcitrun.a";
+	return "lib/libcitrun.a";
 }
 
 void
diff --git a/bin/inst_fewin32.cc b/bin/inst_fewin32.cc
@@ -25,8 +25,6 @@
 #include <iostream>		// cerr
 #include <sstream>		// ostringstream
 
-#define PATH_SEP ';'
-
 
 static void
 Err(int code, const char *fmt)