Skip to content

Commit dd95d07

Browse files
sam-githubBridgeAR
authored andcommitted
Revert "deps: remove OpenSSL git and travis configuration"
This reverts commit f395a4a. As of openssl-1.1.1b, the dot-files are no longer distributed, so this is no longer necessary. PR-URL: #26327 Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 0abb724 commit dd95d07

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: deps/openssl/config/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ COPTS = no-comp no-shared no-afalgeng
2727
# disable platform check in Configure
2828
NO_WARN_ENV = CONFIGURE_CHECKER_WARN=1
2929

30+
GITIGNORE = $(OPSSL_SRC)/.gitignore
3031
GENERATE = ./generate_gypi.pl
3132

3233
OPSSL_SRC = ../openssl
@@ -44,9 +45,8 @@ all: $(ARCHS) replace
4445

4546
# Configure and generate openssl asm files for each archs
4647
$(ARCHS):
47-
# Remove openssl git and travis configuration, nodejs has its own (and they
48-
# should not have been packaged by upstream).
49-
rm -rf $(OPSSL_SRC)/.git* $(OPSSL_SRC)/.travis*
48+
# Remove openssl .gitignore to follow nodejs .gitignore
49+
if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi
5050
cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@;
5151
$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
5252
# Confgure asm_avx2 and generate upto avx2 support

0 commit comments

Comments
 (0)