diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-07-06 09:38:59 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-07-25 13:08:46 +0200 |
| commit | 54aa9d51b09d67e90db443f682cface795f5af9e (patch) | |
| tree | f084a32458524ee0b877ad563e9b7ff1b159e243 /Configurations/10-main.conf | |
| parent | b4b42d441d350b48449ea93aaa035152123f70ae (diff) | |
Fix default installation paths on mingw
Mingw config targets assumed that resulting programs and libraries are
installed in a Unix-like environment and the default installation
prefix was therefore set to '/usr/local'.
However, mingw programs are installed in a Windows environment, and
the installation directories should therefore have Windows defaults,
i.e. the same kind of defaults as the VC config targets.
A difficulty is, however, that a "cross compiled" build can't figure
out the system defaults from environment the same way it's done when
building "natively", so we have to fall back to hard coded defaults in
that case.
Tests can still be performed when cross compiled on a non-Windows
platform, since all tests only depend on the source and build
directory, and otherwise relies on normal local paths.
CVE-2019-1552
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9400)
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index e311a5dcb6..3c4299d264 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1397,6 +1397,10 @@ my %targets = ( shared_extension => ".dll", multilib => "", apps_aux_src => add("win32_init.c"), + # "WOW" stands for "Windows on Windows", and that word engages + # some installation path heuristics in unix-Makefile.tmpl... + build_scheme => add("WOW", { separator => undef }), + }, "mingw64" => { # As for OPENSSL_USE_APPLINK. Applink makes it possible to use |