| Index: site_scons/site_tools/naclsdk.py
|
| diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
|
| index 4279b95d97e6fff1a86b310e7a95d1f95abed230..7b3f6002c41fee9e7cd90fd4441de056328c8131 100755
|
| --- a/site_scons/site_tools/naclsdk.py
|
| +++ b/site_scons/site_tools/naclsdk.py
|
| @@ -677,7 +677,11 @@ def generate(env):
|
| if 'toolchain_feature_version' in SCons.Script.ARGUMENTS:
|
| version = int(SCons.Script.ARGUMENTS['toolchain_feature_version'])
|
| else:
|
| - version_file = os.path.join(root, 'FEATURE_VERSION')
|
| + feature_version_root = (
|
| + os.path.join(os.path.dirname(root), 'pnacl_translator')
|
| + if (env.Bit('built_elsewhere') and env.Bit('use_sandboxed_translator'))
|
| + else root)
|
| + version_file = os.path.join(feature_version_root, 'FEATURE_VERSION')
|
| if os.path.exists(version_file):
|
| with open(version_file, 'r') as fh:
|
| version = int(fh.read())
|
|
|