X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=fa8ae62d39606527509d7c9a8b8dd18d77db68e7;hb=84da3f6c94dbe7e36aaf088890fda5fcf3b3efb0;hp=0af7374575e1a5979111ea12c999d99e8a288b45;hpb=d1a42f852e58918708b5b0cbd90219f6a95aa75b;p=builder.git diff --git a/source/buildinfo.h b/source/buildinfo.h index 0af7374..fa8ae62 100644 --- a/source/buildinfo.h +++ b/source/buildinfo.h @@ -21,6 +21,13 @@ public: FORCE_DYNAMIC //< Only accept dynamic libraries }; + enum RuntimePathMode + { + NO_RPATH, //< Do not record rpath in binaries + RELATIVE, //< Record relative rpath in binaries + ABSOLUTE //< Record absolute rpath in binaries + }; + class Loader: public Msp::DataFile::ObjectLoader { public: @@ -28,6 +35,7 @@ public: private: void incpath(const std::string &); void define(const std::string &, const std::string &); + void keep_symbol(const std::string &); void libmode_for_lib(const std::string &, LibraryMode); void libpath(const std::string &); void library(const std::string &); @@ -63,10 +71,11 @@ public: public: Tracked(): value(T()), set(false) { } Tracked(T v): value(v), set(false) { } + Tracked(const Tracked &t): value(t.value), set(t.set) { } Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; } - Tracked &operator=(T v) { value = v; set = true; return *this; } - operator T() const { return value; } + Tracked &operator=(const T &v) { value = v; set = true; return *this; } + operator const T &() const { return value; } }; typedef std::map DefineMap; @@ -82,7 +91,9 @@ public: PathList libpath; WordList libs; Tracked libmode; + Tracked rpath_mode; LibModeMap libmodes; + WordList keep_symbols; StandardMap standards; Tracked threads; Tracked debug;