Skip to content

build: don't pass DESTCPU to configure unless set - #13160

Closed
gibfahn wants to merge 4 commits into
nodejs:masterfrom
gibfahn:destcpu-rm
Closed

gibfahn wants to merge 4 commits into
nodejs:masterfrom
gibfahn:destcpu-rm

Conversation

@gibfahn

@gibfahn gibfahn commented May 22, 2017

Copy link
Copy Markdown
Member

If the DESTCPU wasn't manually set, the configure platform detection should be better than the Makefile one. If it was manually set, add it to the CONFIG_FLAGS.

As DESTCPU no longer needs to be manually set, just set ARCH.

Also cleans up the logic.

Fixes: #13150

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

build

If the DESTCPU wasn't manually set, the configure platform detection should be
better than the Makefile one. If it was manually set, add it to the
CONFIG_FLAGS.

As DESTCPU no longer needs to be manually set, just set ARCH.

Fixes: nodejs#13150
@gibfahn gibfahn added the build Issues and PRs related to Node.js builds or CI infrastructure. label May 22, 2017
@gibfahn

gibfahn commented May 23, 2017

Copy link
Copy Markdown
Member Author

cc/ @nodejs/build @nodejs/release @bnoordhuis , PTAL (I'd really like to make sure this doesn't break anything... ).

@joaocgreis

Copy link
Copy Markdown
Member

Test build: https://nodejs.org/download/test/v8.0.0-test2017052389cfb62de6/ (access restricted build: https://ci-release.nodejs.org/job/iojs+release/1696/)

We should confirm that the generated binaries are right.

Comment thread Makefile
# Use Node arch names rather than V8 ones.
ifeq ($(DESTCPU),ia32)
override DESTCPU=x86
endif

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ia32 is the node/v8 arch name; either the comment is wrong or the logic is.

Comment thread Makefile
ARCH ?= arm
else
ifeq ($(findstring aarch64,$(UNAME_M)),aarch64)
ARCH ?= aarch64

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

arm64

Comment thread Makefile
endif

# Handle Node and V8 arch name differences for x86 and arm64.
ifeq ($(ARCH),x86)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This can be:

V8_ARCH = $(ARCH)  # Maybe get rid of this in favor of DESTCPU
ifeq ($(ARCH),ia32)
ARCH = x86
endif

Assuming I read it right.

@BridgeAR

Copy link
Copy Markdown
Member

Ping @gibfahn

@BridgeAR

Copy link
Copy Markdown
Member

Ping @gibfahn again

@BridgeAR

BridgeAR commented Oct 2, 2017

Copy link
Copy Markdown
Member

Closing due to long inactivity. @gibfahn please reopen if you want to pursue this further.

@BridgeAR BridgeAR closed this Oct 2, 2017
@Trott Trott mentioned this pull request Nov 11, 2018
@refack refack self-assigned this Nov 12, 2018
@refack refack reopened this Nov 12, 2018
@rvagg

rvagg commented Nov 14, 2018

Copy link
Copy Markdown
Member

@refack maybe you should open a separate PR if you want to pursue this? there's a bit too much wrong here and it seems to be quite stale

@refack

refack commented Nov 14, 2018

Copy link
Copy Markdown
Contributor

@refack maybe you should open a separate PR if you want to pursue this? there's a bit too much wrong here and it seems to be quite stale

Yes I've discovered that...

@refack refack closed this Nov 14, 2018
@refack refack removed their assignment Mar 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Issues and PRs related to Node.js builds or CI infrastructure.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants