X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=e2df34c06e3ec91cb56500f97c3bed1b53b23d02;hb=a5a1ecb806ec2dec26701b931b8d2d6cbe7f4928;hp=114a368ecc96feabec39807621d1dc0d1a363e85;hpb=5c8e939372ae18bef52a2961826f8467d29f12f3;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 114a368..e2df34c 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -28,6 +28,7 @@ void unique(list<T> &l)
 
 BuildInfo::BuildInfo():
 	libmode(DYNAMIC),
+	rpath_mode(NO_RPATH),
 	threads(false),
 	debug(false),
 	optimize(0),
@@ -64,6 +65,7 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 		sysroot = bi.sysroot;
 		local_incpath.insert(local_incpath.begin(), bi.local_incpath.begin(), bi.local_incpath.end());
 		libmode = bi.libmode;
+		rpath_mode = bi.rpath_mode;
 		for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
 			libmodes[i->first] = i->second;
 		keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
@@ -95,6 +97,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	add("libmode",  &Loader::libmode_for_lib);
 	add("local_incpath", &Loader::local_incpath);
 	add("optimize", &BuildInfo::optimize);
+	add("runtime_path_mode", &BuildInfo::rpath_mode);
 	add("standard", &Loader::standard);
 	add("strip",    &BuildInfo::strip);
 	add("sysroot",  &Loader::sysroot);
@@ -162,3 +165,16 @@ void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 	else
 		throw lexical_error(format("Conversion of '%s' to LibraryMode", conv.get()));
 }
+
+
+void operator>>(const LexicalConverter &conv, BuildInfo::RuntimePathMode &rpath_mode)
+{
+	if(conv.get()=="NONE")
+		rpath_mode = BuildInfo::NO_RPATH;
+	else if(conv.get()=="RELATIVE")
+		rpath_mode = BuildInfo::RELATIVE;
+	else if(conv.get()=="ABSOLUTE")
+		rpath_mode = BuildInfo::ABSOLUTE;
+	else
+		throw lexical_error(format("Conversion of '%s' to RuntimePathMode", conv.get()));
+}