Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

deps: allow openssl to build for WOA#515

Merged
kfarnung merged 1 commit into
nodejs:masterfrom
kfarnung:armfix
Apr 18, 2018
Merged

deps: allow openssl to build for WOA#515
kfarnung merged 1 commit into
nodejs:masterfrom
kfarnung:armfix

Conversation

@kfarnung

@kfarnung kfarnung commented Apr 18, 2018

Copy link
Copy Markdown
Contributor

Add definitions to enable building for Windows on ARM

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@kfarnung kfarnung self-assigned this Apr 18, 2018
@kfarnung

Copy link
Copy Markdown
Contributor Author

@kfarnung

Copy link
Copy Markdown
Contributor Author

New CI for vcbuild change: https://ci.nodejs.org/job/chakracore-test/312/

@digitalinfinity

Copy link
Copy Markdown
Contributor

Is this my change more or less verbatim or are there particular changes you'd like me to review? If not, LGTM 😄

@kfarnung

Copy link
Copy Markdown
Contributor Author

It's just your change with the patch for vcbuild.bat. I believe the build machines in the CI have NASM installed so it again went down the Linux path.

@kfarnung

Copy link
Copy Markdown
Contributor Author

Looks like the ARM build is good now: https://ci.nodejs.org/job/node-compile-windows/17473/label=win-vs2017-arm/

@digitalinfinity

Copy link
Copy Markdown
Contributor

Ah lol! I wondered about that but assumed that the config script would have automatically switched to using the asm disabled version. Ok, LGTM- thanks for adopting!

* Add definitions to enable building for Windows on ARM
* Disable ASM for Windows on ARM builds

PR-URL: nodejs#515
Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
@kfarnung
kfarnung merged commit 2ace7b6 into nodejs:master Apr 18, 2018
@kfarnung
kfarnung deleted the armfix branch April 18, 2018 22:45
kfarnung pushed a commit to kfarnung/node-chakracore that referenced this pull request Apr 18, 2018
* Add definitions to enable building for Windows on ARM
* Disable ASM for Windows on ARM builds

PR-URL: nodejs#515
Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
kfarnung pushed a commit to kfarnung/node-chakracore that referenced this pull request Apr 18, 2018
* Add definitions to enable building for Windows on ARM
* Disable ASM for Windows on ARM builds

PR-URL: nodejs#515
Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants