| Submitter | phabricator |
|---|---|
| Date | July 14, 2019, 5:36 a.m. |
| Message ID | <differential-rev-PHID-DREV-xsrykqhxbazuhrd5vba2-req@mercurial-scm.org> |
| Download | mbox | patch |
| Permalink | /patch/40919/ |
| State | Superseded |
| Headers | show |
Comments
Patch
diff --git a/contrib/automation/hgautomation/windows.py b/contrib/automation/hgautomation/windows.py --- a/contrib/automation/hgautomation/windows.py +++ b/contrib/automation/hgautomation/windows.py @@ -39,7 +39,7 @@ $Env:PATH = "${root}\VC\Bin;${root}\WinSDK\Bin;$Env:PATH" $Env:INCLUDE = "${root}\VC\Include;${root}\WinSDK\Include;$Env:INCLUDE" $Env:LIB = "${root}\VC\Lib;${root}\WinSDK\Lib;$Env:LIB" -$Env:LIBPATH = "${root}\VC\lib;${root}\WinSDK\Lib:$Env:LIBPATH" +$Env:LIBPATH = "${root}\VC\lib;${root}\WinSDK\Lib;$Env:LIBPATH" '''.lstrip() HG_PURGE = r'''
mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I haven't tried building the x86 installer, but happened to notice this when working on the thg installer. Experimenting in PowerShell seems to show that LIBPATH was expanded at the end, but with ':' between, it effectively corrupted `${root}\WinSDK\Lib` and the first path in LIBPATH. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6642 AFFECTED FILES contrib/automation/hgautomation/windows.py CHANGE DETAILS To: mharbison72, #hg-reviewers Cc: mercurial-devel