Skip to content

Commit d5d9f8c

Browse files
committed
fixup! build,deps,tools: prepare to update to OpenSSL 3.5
1 parent 519041b commit d5d9f8c

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,7 @@ HAS_DOCKER ?= $(shell command -v docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo
16411641

16421642
.PHONY: gen-openssl
16431643
ifeq ($(HAS_DOCKER), 1)
1644-
DOCKER_COMMAND ?= docker run -it -v $(PWD):/node
1644+
DOCKER_COMMAND ?= docker run --rm -u $(shell id -u) -v $(PWD):/node
16451645
IS_IN_WORKTREE = $(shell grep '^gitdir: ' $(PWD)/.git 2>/dev/null)
16461646
GIT_WORKTREE_COMMON = $(shell git rev-parse --git-common-dir)
16471647
DOCKER_COMMAND += $(if $(IS_IN_WORKTREE), -v $(GIT_WORKTREE_COMMON):$(GIT_WORKTREE_COMMON))

tools/dep_updaters/update-openssl.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,12 @@ regenerate() {
6969

7070
echo "Regenerating platform-dependent files..."
7171

72-
# shellcheck disable=SC2312
73-
DOCKER_COMMAND="docker run --rm -u $(id -u) -v $(pwd):/node"
74-
export DOCKER_COMMAND
7572
make -C "$DEPS_DIR/openssl/config" clean
7673
# Needed for compatibility with nasm on 32-bit Windows
7774
# See https://github.com/nodejs/node/blob/main/doc/contributing/maintaining/maintaining-openssl.md#2-execute-make-in-depsopensslconfig-directory
7875
sed -i 's/#ifdef/%ifdef/g' "$DEPS_DIR/openssl/openssl/crypto/perlasm/x86asm.pl"
7976
sed -i 's/#endif/%endif/g' "$DEPS_DIR/openssl/openssl/crypto/perlasm/x86asm.pl"
80-
make gen-openssl
77+
make -C "$BASE_DIR" gen-openssl
8178

8279
echo "All done!"
8380
echo ""

0 commit comments

Comments
 (0)