Also fix using relative paths proper under package root
@@ -246,7 +246,15 @@ class Context(context_base.ContextBase):
@property
def ctu_func_map_cmd(self):
- return self.pckg_layout['ctu_func_map_cmd']
+ ctu_func_mapping = self.pckg_layout['ctu_func_map_cmd']
+
+ if os.path.dirname(ctu_func_mapping):
+ # If it is a relative path, it is by definition relative to
+ # the package_root, just like how analyzers are set up.
+ ctu_func_mapping = os.path.join(self.__package_root,
+ ctu_func_mapping)
+
+ return ctu_func_mapping
def get_context():
