X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuildinfo.h;h=ccfa2b630bc9f47a03e471c846e8bc7e2e3c8838;hb=6a166cffc39f3d2f447a9da932407eddbc51135a;hp=0af7374575e1a5979111ea12c999d99e8a288b45;hpb=d1a42f852e58918708b5b0cbd90219f6a95aa75b;p=builder.git diff --git a/source/buildinfo.h b/source/buildinfo.h index 0af7374..ccfa2b6 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 &); @@ -65,8 +73,8 @@ public: Tracked(T v): value(v), set(false) { } 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 +90,9 @@ public: PathList libpath; WordList libs; Tracked libmode; + Tracked rpath_mode; LibModeMap libmodes; + WordList keep_symbols; StandardMap standards; Tracked threads; Tracked debug;