commit fa9a502a387a26ba116840d35ae4a30f672e78ad
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sat Feb 17 19:31:37 2018 -0800
committer Steve Dower <steve.dower@microsoft.com> Sat Feb 17 19:31:37 2018 -0800
tree 16fa15e74aae8b80136ca7a95b986e02fe1b4687
parent d5be8e13b0ccf4473300d3a1672fc113702cf66c

[3.7] Improves the ability to build in CI (GH-5729)

PCbuild/python.props

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 39b7b8a..f943313 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -43,7 +43,9 @@
     <BuildPath Condition="$(Configuration) == 'PGInstrument'">$(BuildPath)instrumented\</BuildPath>
     
     <!-- Directories of external projects. tcltk is handled in tcltk.props -->
-    <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
+    <ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
+    <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
+    <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
     <sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>