diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-02-17 15:20:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-02-27 08:49:14 +0100 |
| commit | c3845ceba84aab9ddeb43f043549238fd10de63b (patch) | |
| tree | 1ede66486b73864f3a80ab2ae56556a9c85476d5 /Configurations/windows-makefile.tmpl | |
| parent | 285e2991af23974761b9497f1e2a3396aa4bc440 (diff) | |
Build file templates: don't set OPENSSL_{ENGINES,MODULES}
Since we've now switched to use util/wrap.pl to wrap uninstalled
programs everywhere, there's no need to set the environment variables
OPENSSL_ENGINES and OPENSSL_MODULES globally for the tests.
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/11110)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index afc386daec..859d3a6324 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -357,7 +357,7 @@ PROCESSOR= {- $config{processor} -} # The main targets ################################################### -{- dependmagic('build_sw'); -}: build_libs_nodep build_modules_nodep build_programs_nodep +{- dependmagic('build_sw'); -}: build_libs_nodep build_modules_nodep build_programs_nodep copy-utils {- dependmagic('build_libs'); -}: build_libs_nodep {- dependmagic('build_modules'); -}: build_modules_nodep {- dependmagic('build_programs'); -}: build_programs_nodep @@ -385,13 +385,11 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs all: build_sw build_docs test: tests -{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep +{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep copy-utils @{- output_off() if $disabled{tests}; "" -} set SRCTOP=$(SRCDIR) set BLDTOP=$(BLDDIR) set PERL=$(PERL) - set OPENSSL_ENGINES=$(MAKEDIR)\engines - set OPENSSL_MODULES=$(MAKEDIR)\providers "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @$(ECHO) "Tests are not supported with your chosen Configure options" @@ -544,6 +542,14 @@ install_html_docs: build_html_docs uninstall_html_docs: +# Helper targets ##################################################### + +copy-utils: $(BLDDIR)\util\wrap.pl + +$(BLDDIR)\util\wrap.pl: configdata.pm + @if NOT EXIST "$(BLDDIR)\util" mkdir "$(BLDDIR)\util" + @if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\util\$(@F)" "$(BLDDIR)\util" + # Building targets ################################################### configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} |