Skip to content

Comments

Avoid empty lines in nmake rule bodies [master]#16048

Closed
levitte wants to merge 1 commit intoopenssl:masterfrom
levitte:fix-16014
Closed

Avoid empty lines in nmake rule bodies [master]#16048
levitte wants to merge 1 commit intoopenssl:masterfrom
levitte:fix-16014

Conversation

@levitte
Copy link
Member

@levitte levitte commented Jul 12, 2021

nmake is tolerant of those empty lines, but jom isn't. That tolerance
isn't standard make behaviour, so we lean towards avoiding them.

We simply use '@Rem' instead.

Fixes #16014

nmake is tolerant of those empty lines, but jom isn't.  That tolerance
isn't standard make behaviour, so we lean towards avoiding them.

We simply use '@Rem' instead.

Fixes openssl#16014
@levitte levitte added branch: master Applies to master branch approval: review pending This pull request needs review by a committer labels Jul 12, 2021
@levitte
Copy link
Member Author

levitte commented Jul 12, 2021

Corresponding fix for 1.1.1 in #16047

@paulidale paulidale added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Jul 12, 2021
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Jul 13, 2021
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Jul 13, 2021
nmake is tolerant of those empty lines, but jom isn't.  That tolerance
isn't standard make behaviour, so we lean towards avoiding them.

We simply use '@Rem' instead.

Fixes #16014

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from #16048)
@levitte
Copy link
Member Author

levitte commented Jul 13, 2021

Merged

53111a8 Avoid empty lines in nmake rule bodies

@levitte levitte closed this Jul 13, 2021
@levitte levitte deleted the fix-16014 branch July 13, 2021 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Configure with no-stdio on Windows generates makefile that doesn't work with jom

4 participants