Skip to content

Commit

Permalink
BaseTools/edksetup.sh: fix invalid test for current working directory
Browse files Browse the repository at this point in the history
edksetup.sh implements a test that requires the current working
directory to contain the edksetup.sh script.  This test has the side
effect of requiring the WORKSPACE to be set to the same directory as
the edksetup.sh.  In a multiple workspace configuration, it is
required to be able to have a WORKSPACE that is different from the
directory that contains edksetup.sh.  This changeset skips this test
if PACKAGE_PATH is set.

Change-Id: Ie6f16a08c012baf4e650c48cc8e91cdc466d05f2
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Ruffin <chris.ruffin@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
  • Loading branch information
ChrisRuffinIntel authored and Yonghong Zhu committed Aug 10, 2017
1 parent d506d8d commit 95cc9a5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion edksetup.sh
Expand Up @@ -54,7 +54,7 @@ function SetWorkspace()
return 0
fi

if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ]
if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH" ]
then
echo Run this script from the base of your tree. For example:
echo " cd /Path/To/Edk/Root"
Expand Down

0 comments on commit 95cc9a5

Please sign in to comment.