Don't return const ref strings in ctor::configuration::get. Instead return std::string by copy.

1 files changed, 6 insertions, 11 deletions

diff --git a/src/bootstrap.cc b/src/bootstrap.cc
index aa50561..0179f7b 100644
--- a/src/bootstrap.cc
+++ b/src/bootstrap.cc
@@ -41,41 +41,36 @@ bool ctor::configuration::has(const std::string& key) const
 	return false;
 }
 
-const std::string& ctor::configuration::get(const std::string& key, const std::string& default_value) const
+std::string ctor::configuration::get(const std::string& key, const std::string& default_value) const
 {
 	auto cxx_env = std::getenv("CXX");
 	if(key == ctor::cfg::build_cxx && cxx_env)
 	{
-		static std::string s = cxx_env;
-		return s;
+		return cxx_env;
 	}
 
 	auto cc_env = std::getenv("CC");
 	if(key == ctor::cfg::build_cc && cc_env)
 	{
-		static std::string s = cc_env;
-		return s;
+		return cc_env;
 	}
 
 	auto ld_env = std::getenv("LD");
 	if(key == ctor::cfg::build_ld && ld_env)
 	{
-		static std::string s = ld_env;
-		return s;
+		return ld_env;
 	}
 
 	auto ar_env = std::getenv("AR");
 	if(key == ctor::cfg::build_ar && ar_env)
 	{
-		static std::string s = ar_env;
-		return s;
+		return ar_env;
 	}
 
 	auto builddir_env = std::getenv("BUILDDIR");
 	if(key == ctor::cfg::builddir && builddir_env)
 	{
-		static std::string s = builddir_env;
-		return s;
+		return builddir_env;
 	}
 
 	return default_value;