diff options
| author | Andrew Boie <andrew.p.boie@intel.com> | 2013-12-19 13:21:46 -0800 |
|---|---|---|
| committer | Andrew Boie <andrew.p.boie@intel.com> | 2013-12-19 14:34:23 -0800 |
| commit | 6905e2163fac5d2be59afeabbfc81ec41ac04560 (patch) | |
| tree | 3dc71fdd1ae48bcb0d57d80e9b120bb9138c3daf /envsetup.sh | |
| parent | 3d3dd4a186309a62a744d7fea1157158e05bcf6e (diff) | |
| download | build-6905e2163fac5d2be59afeabbfc81ec41ac04560.zip build-6905e2163fac5d2be59afeabbfc81ec41ac04560.tar.gz build-6905e2163fac5d2be59afeabbfc81ec41ac04560.tar.bz2 | |
envsetup.sh: cd to toplevel in get_build_var
dumpvar doesn't work right if we're not called from the toplevel;
due to the way the build system works internally, -C does not
suffice. This was already done in get_abs_build_var.
Redundant -C calls removed since we're at the toplevel already.
Change-Id: Iaaa48982547d099186922cc3ddc417a82c85e9a5
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/envsetup.sh b/envsetup.sh index 33d73f1..bc4f6a1 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -34,7 +34,7 @@ function get_abs_build_var() return fi (\cd $T; CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \ - make --no-print-directory -C "$T" -f build/core/config.mk dumpvar-abs-$1) + make --no-print-directory -f build/core/config.mk dumpvar-abs-$1) } # Get the exact value of a build variable. @@ -45,8 +45,8 @@ function get_build_var() echo "Couldn't locate the top of the tree. Try setting TOP." >&2 return fi - CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \ - make --no-print-directory -C "$T" -f build/core/config.mk dumpvar-$1 + (\cd $T; CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \ + make --no-print-directory -f build/core/config.mk dumpvar-$1) } # check to see if the supplied product is one we can build |