Skip to content

Commit c7e5fca

Browse files
jkunkeetargos
authored andcommitted
deps: make VC-WIN config generation deterministic
This change adds a clean target to the VC-WIN* Makefiles, then adjusts the config generation script to call it before config file generation as well as after. This prevents files from previous configurations from causing make to incorrectly assume the files are up to date. PR-URL: #27543 Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent cc45080 commit c7e5fca

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

deps/openssl/config/Makefile_VC-WIN32

+3-1
Original file line numberDiff line numberDiff line change
@@ -5678,8 +5678,10 @@ engines/padlock-dso-e_padlock.obj: engines/padlock-dso-e_padlock.d
56785678
engines/padlock.def: util/engines.num util/mkdef.pl
56795679
$(PERL) util/mkdef.pl --ordinals util/engines.num --name padlock --OS windows > engines/padlock.def
56805680

5681-
distclean:
5681+
clean:
5682+
$(RM) $(GENERATED_MANDATORY)
56825683
$(RM) $(GENERATED)
5684+
distclean:
56835685
$(RM) configdata.pm
56845686
$(RM) makefile
56855687
$(RM) NUL

deps/openssl/config/Makefile_VC-WIN64-ARM

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ MINOR=1.1
1717
SHLIB_VERSION_NUMBER=1.1
1818

1919
GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h
20+
GENERATED=crypto/buildinf.h apps/progs.h
2021

2122
INSTALL_LIBS="libcrypto.lib" "libssl.lib"
2223
INSTALL_SHLIBS="libcrypto-1_1-arm64.dll" "libssl-1_1-arm64.dll"
@@ -141,7 +142,9 @@ include/openssl/opensslconf.h:
141142
"$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \
142143
"-omakefile" "include/openssl/opensslconf.h.in" > $@
143144

144-
distclean:
145+
clean:
146+
$(RM) $(GENERATED_MANDATORY)
145147
$(RM) $(GENERATED)
148+
distclean:
146149
$(RM) /Q /F configdata.pm
147150
$(RM) /Q /F makefile

deps/openssl/config/Makefile_VC-WIN64A

+3-1
Original file line numberDiff line numberDiff line change
@@ -2950,7 +2950,9 @@ engines/e_padlock.d: "engines/e_padlock.c"
29502950
engines/e_padlock.obj: engines/e_padlock.d
29512951
$(CC) $(DSO_CFLAGS) /I "include" $(DSO_CPPFLAGS) -c $(COUTFLAG)$@ "engines/e_padlock.c"
29522952

2953-
distclean:
2953+
clean:
2954+
$(RM) $(GENERATED_MANDATORY)
29542955
$(RM) $(GENERATED)
2956+
distclean:
29552957
$(RM) /Q /F configdata.pm
29562958
$(RM) /Q /F makefile

deps/openssl/config/generate_gypi.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
# Generate arch dependent header files with Makefile
4747
my $buildinf = "crypto/buildinf.h";
4848
my $progs = "apps/progs.h";
49-
my $cmd1 = "cd ../openssl; make -f $makefile build_generated $buildinf $progs;";
49+
my $cmd1 = "cd ../openssl; make -f $makefile clean build_generated $buildinf $progs;";
5050
system($cmd1) == 0 or die "Error in system($cmd1)";
5151

5252
# Copy and move all arch dependent header files into config/archs

0 commit comments

Comments
 (0)