Skip to content

Commit dee9165

Browse files
zoobazooba
committed
Issue #23461: Normalise line endings when comparing old and new contents of importlib.h
1 parent 5f77a1b commit dee9165

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎PCbuild/_freeze_importlib.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
<Exec Command='"$(TargetPath)" "$(PySourcePath)Lib\importlib\_bootstrap.py" "$(IntDir)importlib.g.h"' />
8686

8787
<PropertyGroup>
88-
<_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h'))</_OldContent>
89-
<_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h'))</_NewContent>
88+
<_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h').Replace(`&#x0D;&#x0A;`, `&#x0A;`))</_OldContent>
89+
<_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h').Replace(`&#x0D;&#x0A;`, `&#x0A;`))</_NewContent>
9090
</PropertyGroup>
9191

9292
<Copy SourceFiles="$(IntDir)importlib.g.h"

0 commit comments

Comments
 (0)