Skip to content

Conversation

@SteveL-MSFT
Copy link
Member

https://github.com/dotnet/coreclr/issues/13667 prevents this from running correctly, but it builds correctly

Fix #2463

Copy link
Member

@TravisEz13 TravisEz13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @daxian-dbw Can you review?

build.psm1 Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: inconsistent use of braces

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix

build.psm1 Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same nit

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix

@TravisEz13
Copy link
Member

Can we either merge the PR to update build.sh here or remove it.

Copy link
Member

@TravisEz13 TravisEz13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daxian-dbw
This LGTM.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not modify $Script:Options. $Script:Options in packaging.psm1 is pointing to the same object holding by $script:Options in build.psm1 which is supposed to reflect the real configuration of the latest build.

I suggest to add one if block below to set crossGenCorrect in case of deb-arm, like

if ($Type -eq "deb-arm") {
    $crossGenCorrect = $true
} elseif(-not $IncludeSymbols.IsPresent -and $Script:Options.CrossGen) {
   ....
} elseif ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will change

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we don't change $Script:Options, this line should be moved back to its original position.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will fix

@TravisEz13
Copy link
Member

@SteveL-MSFT Please fix merge conflicts

@SteveL-MSFT
Copy link
Member Author

@TravisEz13 fixed

@SteveL-MSFT
Copy link
Member Author

@TravisEz13 can you merge?

@TravisEz13 TravisEz13 merged commit 6f1c7a0 into PowerShell:master Sep 11, 2017
@SteveL-MSFT SteveL-MSFT deleted the raspberry-pi branch September 11, 2017 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants