citrun

commit 20b0e057ba70c92e6d3e413c1448282b0a4cd8c3
parent 6976598d086146c00bcee34c12a6781a1388335d
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat,  9 Jul 2016 13:02:17 -0600

src: remove CITRUN_LIB env var override

Diffstat:
M
Test/Project.pm
 | 
4
+---
M
src/inst_main.cc
 | 
11
+++--------

2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Test/Project.pm b/Test/Project.pm
@@ -50,9 +50,7 @@ EOF
 	close( $jamfile_fh );
 
 	# Use the tools in this source tree
-	my $cwd = getcwd;
-	$ENV{CITRUN_LIB} = "$cwd/lib/libcitrun.a";
-	$ENV{PATH} = "$cwd/share:$ENV{PATH}";
+	$ENV{PATH} = getcwd . "/share:$ENV{PATH}";
 
 	my $ret = system( "cd $tmp_dir && jam" );
 	die "make failed: $ret\n" if ($ret);
diff --git a/src/inst_main.cc b/src/inst_main.cc
@@ -146,17 +146,12 @@ restore_original_src(std::map<std::string, std::string> const &temp_file_map)
 void
 patch_link_command(std::vector<char *> &args)
 {
-	// libcitrun.a uses pthread so we must link it here, except osx.
+	// libcitrun.a uses pthread so we must link it here.
 #ifndef __APPLE__
+	// Except Mac OS, who always links this.
 	args.push_back(const_cast<char *>("-pthread"));
 #endif
-
-	char *lib_str;
-	if ((lib_str = getenv("CITRUN_LIB")) == NULL)
-		// Trap door not found.
-		args.push_back(const_cast<char *>(STR(CITRUN_LIB)));
-	else
-		args.push_back(lib_str);
+	args.push_back(const_cast<char *>(STR(CITRUN_LIB)));
 }
 
 int