diff options
| author | Yu Liu <yudiliu@google.com> | 2022-05-03 17:26:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-03 17:26:49 +0000 |
| commit | b88b1af9b1d70ade7f011d41247e846e2ed173e9 (patch) | |
| tree | 15be99cd1ac90d96e09014f0398a520117332da1 | |
| parent | d264f4bf6e73d5a4a1dc7d44fac3155009707cbe (diff) | |
| parent | 013b2aa75abc5a1e4ad9236a8cb24c3b0ca06b21 (diff) | |
| download | bazel-b88b1af9b1d70ade7f011d41247e846e2ed173e9.tar.gz | |
Merge "Add repo prefix to the include dirs."
| -rw-r--r-- | rules/cc/cc_library_common.bzl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/cc/cc_library_common.bzl b/rules/cc/cc_library_common.bzl index 1431ff3c..eb270af1 100644 --- a/rules/cc/cc_library_common.bzl +++ b/rules/cc/cc_library_common.bzl @@ -64,7 +64,11 @@ def get_includes_paths(ctx, dirs, package_relative = True): execution_rel_dir = ctx.label.package if len(rel_dir) > 0: execution_rel_dir = execution_rel_dir + "/" + rel_dir - execution_relative_dirs.append(execution_rel_dir) + # To allow this repo to be used as an external one. + repo_prefix_dir = execution_rel_dir + if ctx.label.workspace_root != "": + repo_prefix_dir = ctx.label.workspace_root + "/" + execution_rel_dir + execution_relative_dirs.append(repo_prefix_dir) # to support generated files, we also need to export includes relatives to the bin directory if not execution_rel_dir.startswith("/"): |