Bug 1570598 - Pass the clang json file as an argument to the toolchain script. r=froydnj
Make the argument use the same format as resources, so move the sub-script invocation accordingly. Differential Revision: https://phabricator.services.mozilla.com/D40364
This commit is contained in:
@@ -620,6 +620,7 @@ if __name__ == "__main__":
|
||||
cc_name = "clang-cl"
|
||||
cxx_name = "clang-cl"
|
||||
|
||||
config_dir = os.path.dirname(args.config.name)
|
||||
config = json.load(args.config)
|
||||
|
||||
llvm_revision = config["llvm_revision"]
|
||||
@@ -706,7 +707,7 @@ if __name__ == "__main__":
|
||||
git_clone(base_dir, URL_REPO, source_dir, llvm_revision)
|
||||
|
||||
for p in config.get("patches", []):
|
||||
patch(p, source_dir)
|
||||
patch(os.path.join(config_dir, p), source_dir)
|
||||
|
||||
compiler_rt_source_link = llvm_source_dir + "/projects/compiler-rt"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user