FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

build: fix DESTCPU detection on non-Intel platforms by richardlau · Pull Request #6310 · nodejs/node · GitHub

/ node Public

build: fix DESTCPU detection on non-Intel platforms - #6310

Closed
richardlau wants to merge 1 commit into
nodejs:masterfrom
richardlau:fix-arch-detection
ConversationCommits (1)ChecksFiles changed
Closed

build: fix DESTCPU detection on non-Intel platforms#6310
richardlau wants to merge 1 commit into
nodejs:masterfrom
richardlau:fix-arch-detection

Conversation

richardlau commented Apr 20, 2016

Copy link
Copy Markdown
Member
Checklist
  • the commit message follows commit guidelines
Affected core subsystem(s)

build

Description of change

make binary attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture (i.e. it was checking for x64
and assuming x86 otherwise).

richardlau commented Apr 20, 2016

Copy link
Copy Markdown
Member Author

cc @mhdawson

mscdex added the build Issues and PRs related to build files or the CI. label Apr 20, 2016
mhdawson self-assigned this Apr 20, 2016

mhdawson commented Apr 20, 2016

Copy link
Copy Markdown
Member

Just wondering which case this covers:

+ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
+DESTCPU ?= ppc
+else

otherwise LGTM

richardlau commented Apr 20, 2016

Copy link
Copy Markdown
Member Author

That case covers AIX.

jbergstroem commented Apr 21, 2016

Copy link
Copy Markdown
Member

@nodejs/build

richardlau commented Apr 21, 2016

Copy link
Copy Markdown
Member Author

Note about the implementation:
I chose to extend what was already there in the makefile. Using variants of uname I don't see a way of detecting 32-bit/64-bit on AIX.

With regards to host architecture detection there are two other places this is done in the build scripts:

  • in host_arch_cc() in configure -- configure sets the target arch to the detected host arch if --dest-cpu is not specified (in the case of make binary, configure is run with --dest-cpu=$(DESTCPU))
  • in GuessArchitecture() in tools/utils.py -- This is used by tools/test.py and for some reason only selects 32-bit architectures

richardlau commented Apr 21, 2016

Copy link
Copy Markdown
Member Author

@mhdawson I've updated the commit so on AIX it defaults to 64-bit as we discussed on the phone.

mhdawson commented Apr 21, 2016

Copy link
Copy Markdown
Member

LGTM

mhdawson commented Apr 21, 2016

Copy link
Copy Markdown
Member

@jbergstroem just wondering if you can take a quick look and let me know if you have any concerns with this.

estliberitas force-pushed the master branch 2 times, most recently from 7da4fd4 to c7066fb Compare April 26, 2016 05:23

joaocgreis commented Apr 26, 2016

Copy link
Copy Markdown
Member

I can't claim to know enough of this to stamp it, but since it uses only ?= it seems quite safe to me.

However, at least ARM64 is missing:

$ uname -m
aarch64

build: fix DESTCPU detection for binary target
972cb47 
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

richardlau commented Apr 26, 2016

Copy link
Copy Markdown
Member Author

Thanks, rebased onto latest master and added aarch64.

MylesBorins commented May 12, 2016

Copy link
Copy Markdown
Contributor

ci: https://ci.nodejs.org/job/node-test-pull-request/2614/

overall the changes to the makefile LGTM

How was ppc + arm being detected and built correctly before?

rvagg commented May 13, 2016

Copy link
Copy Markdown
Member

sgtm

might be time to pull out all of this ARCH and DESTCPU stuff into a script (bash or perl) in tools

jbergstroem commented May 13, 2016

Copy link
Copy Markdown
Member

@rvagg we could use python's os stuff. Would align well with our build stack.

rvagg commented May 13, 2016

Copy link
Copy Markdown
Member

@jbergstroem sounds good.

To clarify though, that shouldn't hold up this PR if the IBM folks agree.

@thealphanerd we manually specify both ARCH and DESTCPU in all (?) our build machines so we don't get caught up by this, it's obviously a concern for end-users on any of these platforms, however.

jbergstroem commented May 13, 2016

Copy link
Copy Markdown
Member

@rvagg we don't manually specify it on all our machines; mainly release-related stuff -- I think we should avoid it where possible since we'd be testing the configure process as well. With that said, in cases we have to, we should obviously override (esp DESTCPU).

jbergstroem commented May 13, 2016

Copy link
Copy Markdown
Member

LGTM from me as well btw. Just haven't tried all variations of uname.

mhdawson commented May 13, 2016

Copy link
Copy Markdown
Member

Looks like we have enough LGTMs to land, will do that now

mhdawson pushed a commit that referenced this pull request May 13, 2016
build: fix DESTCPU detection for binary target
830a726 
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

PR-URL: #6310
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

mhdawson commented May 13, 2016

Copy link
Copy Markdown
Member

Landed as 830a726

mhdawson closed this May 13, 2016
evanlucas pushed a commit that referenced this pull request May 17, 2016
build: fix DESTCPU detection for binary target
5149d66 
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

PR-URL: #6310
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
evanlucas mentioned this pull request May 17, 2016
Merged
MylesBorins pushed a commit that referenced this pull request Jun 1, 2016
build: fix DESTCPU detection for binary target
c1537e8 
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

PR-URL: #6310
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins pushed a commit that referenced this pull request Jun 23, 2016
build: fix DESTCPU detection for binary target
627a699 
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

PR-URL: #6310
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins pushed a commit that referenced this pull request Jun 24, 2016
build: fix DESTCPU detection for binary target
43ce6fc 
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

PR-URL: #6310
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins mentioned this pull request Jun 24, 2016
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

mhdawson

Labels

build Issues and PRs related to build files or the CI.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

Back | FazBrowse Home | New Git URL