diff options
| author | Michaël Zasso <targos@protonmail.com> | 2022-01-18 13:37:54 +0300 |
|---|---|---|
| committer | Danielle Adams <adamzdanielle@gmail.com> | 2022-02-01 07:56:39 +0300 |
| commit | 5c1dc5f30715e911c29c3cb21b57001aedb5c7e6 (patch) | |
| tree | 8bf6bf5e8220462e4d3b9ba5fcc73ec1b9b8cab8 /Makefile | |
| parent | 1db154fa96fd1d30e6b2938e814ed26c158af2f2 (diff) | |
build: fix npm version detection
Npm's package.json now contains two fields named "version".
Grep for the top-level one.
Fixes: https://github.com/nodejs/build/issues/2850
PR-URL: https://github.com/nodejs/node/pull/41575
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -830,7 +830,7 @@ PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]') ifeq ($(findstring os/390,$PLATFORM),os/390) PLATFORM ?= os390 endif -NPMVERSION=v$(shell cat deps/npm/package.json | grep '"version"' | sed 's/^[^:]*: "\([^"]*\)",.*/\1/') +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) |