Commit 9baf6c88 authored by Wez Furlong's avatar Wez Furlong Committed by Facebook Github Bot

getdeps: correctly handle the install_dir value

Summary:
We were computing `SCRATCH/install` and hashing based on that value,
but the build stuff was later computing `SCRATCH/installed` and passing that
to the builders.

Fixup the mismatch.

Reviewed By: simpkins

Differential Revision: D15337969

fbshipit-source-id: 70288f2d9286aaacf4c1f6e0dac4680a55edac6d
parent 73130f76
...@@ -59,7 +59,7 @@ class BuildOptions(object): ...@@ -59,7 +59,7 @@ class BuildOptions(object):
num_jobs = multiprocessing.cpu_count() num_jobs = multiprocessing.cpu_count()
if not install_dir: if not install_dir:
install_dir = os.path.join(scratch_dir, "install") install_dir = os.path.join(scratch_dir, "installed")
self.project_hashes = None self.project_hashes = None
for p in ["../deps/github_hashes", "../project_hashes"]: for p in ["../deps/github_hashes", "../project_hashes"]:
...@@ -157,7 +157,7 @@ class BuildOptions(object): ...@@ -157,7 +157,7 @@ class BuildOptions(object):
directory = "%s-%s" % (manifest.name, hash) directory = "%s-%s" % (manifest.name, hash)
build_dir = os.path.join(self.scratch_dir, "build", directory) build_dir = os.path.join(self.scratch_dir, "build", directory)
inst_dir = os.path.join(self.scratch_dir, "installed", directory) inst_dir = os.path.join(self.install_dir, directory)
return {"build_dir": build_dir, "inst_dir": inst_dir, "hash": hash} return {"build_dir": build_dir, "inst_dir": inst_dir, "hash": hash}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment