Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 4 commits into from
Closed

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eff648
build: don't pass DESTCPU to configure unless set
gibfahn May 22, 2017
d70e513
Tmp
gibfahn May 23, 2017
5e1cabf
Tmp: hack makefile to echo vars
gibfahn May 23, 2017
6711623
TODO
gibfahn May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 55 additions & 78 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ ifdef DISABLE_V8_I18N
V8_BUILD_OPTIONS += i18nsupport=off
endif

# Use Node arch names rather than V8 ones.
ifeq ($(DESTCPU),ia32)
override DESTCPU=x86
endif
Copy link
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.

ifeq ($(DESTCPU),aarch64)
override DESTCPU=arm64
endif

ifdef DESTCPU
CONFIG_FLAGS += --dest-cpu=$(DESTCPU)
endif

BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[A-Z]' '[a-z]')

# Determine EXEEXT
Expand Down Expand Up @@ -564,86 +576,53 @@ RELEASE=$(shell sed -ne 's/\#define NODE_VERSION_IS_RELEASE \([01]\)/\1/p' src/n
PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]')
NPMVERSION=v$(shell cat deps/npm/package.json | grep '"version"' | sed 's/^[^:]*: "\([^"]*\)",.*/\1/')

UNAME_M=$(shell uname -m)
ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
DESTCPU ?= x64
else
ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
DESTCPU ?= ppc64
else
ifeq ($(findstring ppc,$(UNAME_M)),ppc)
DESTCPU ?= ppc
else
ifeq ($(findstring s390x,$(UNAME_M)),s390x)
DESTCPU ?= s390x
else
ifeq ($(findstring s390,$(UNAME_M)),s390)
DESTCPU ?= s390
ifdef DESTCPU
ARCH = $(DESTCPU)
else
ifeq ($(findstring arm,$(UNAME_M)),arm)
DESTCPU ?= arm
else
ifeq ($(findstring aarch64,$(UNAME_M)),aarch64)
DESTCPU ?= aarch64
else
ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
DESTCPU ?= ppc64
else
DESTCPU ?= x86
endif
endif
endif
endif
endif
endif
endif
endif
ifeq ($(DESTCPU),x64)
ARCH=x64
else
ifeq ($(DESTCPU),arm)
ARCH=arm
else
ifeq ($(DESTCPU),aarch64)
ARCH=arm64
else
ifeq ($(DESTCPU),ppc64)
ARCH=ppc64
else
ifeq ($(DESTCPU),ppc)
ARCH=ppc
else
ifeq ($(DESTCPU),s390)
ARCH=s390
else
ifeq ($(DESTCPU),s390x)
ARCH=s390x
else
ARCH=x86
endif
endif
endif
endif
endif
endif
endif

# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
# pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.
ifeq ($(DESTCPU),x86)
UNAME_M=$(shell uname -m)
ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
ARCH ?= x64
else
ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
ARCH ?= ppc64
else
ifeq ($(findstring ppc,$(UNAME_M)),ppc)
ARCH ?= ppc
else
ifeq ($(findstring s390x,$(UNAME_M)),s390x)
ARCH ?= s390x
else
ifeq ($(findstring s390,$(UNAME_M)),s390)
ARCH ?= s390
else
ifeq ($(findstring arm,$(UNAME_M)),arm)
ARCH ?= arm
else
ifeq ($(findstring aarch64,$(UNAME_M)),aarch64)
ARCH ?= aarch64
Copy link
Member

Choose a reason for hiding this comment

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

arm64

else
ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
ARCH ?= ppc64
else
ARCH ?= x86
endif
endif
endif
endif
endif
endif
endif
endif
endif

# Handle Node and V8 arch name differences for x86 and arm64.
ifeq ($(ARCH),x86)
Copy link
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.

V8_ARCH=ia32
else
V8_ARCH ?= $(DESTCPU)

endif

# enforce "x86" over "ia32" as the generally accepted way of referring to 32-bit intel
ifeq ($(ARCH),ia32)
override ARCH=x86
endif
ifeq ($(DESTCPU),ia32)
override DESTCPU=x86
ifeq ($(ARCH),arm64)
V8_ARCH ?= aarch64
endif
V8_ARCH ?= $(ARCH)

TARNAME=node-$(FULLVERSION)
TARBALL=$(TARNAME).tar
Expand Down Expand Up @@ -762,7 +741,6 @@ doc-upload: doc
$(TARBALL)-headers: release-only
$(PYTHON) ./configure \
--prefix=/ \
--dest-cpu=$(DESTCPU) \
--tag=$(TAG) \
--release-urlbase=$(RELEASE_URLBASE) \
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
Expand Down Expand Up @@ -794,7 +772,6 @@ $(BINARYTAR): release-only
$(RM) -r out/deps out/Release
$(PYTHON) ./configure \
--prefix=/ \
--dest-cpu=$(DESTCPU) \
--tag=$(TAG) \
--release-urlbase=$(RELEASE_URLBASE) \
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
Expand Down