diff options
| author | aSoujyuTanaka <soujyu.tanaka@access-company.com> | 2020-04-12 04:00:17 +0900 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-07-15 23:03:22 +0200 |
| commit | a1736f37aee855fecf463b9f15519e12c333ecfc (patch) | |
| tree | a053aa5046d1619785555cbe59eb949a6b280fc9 | |
| parent | 7a09fab2b3d201062a2cc07c1a40d09d61ea31bd (diff) | |
To generate makefile with correct parameters for WinCE.
Reviewed-by: Mark J. Cox <mark@awe.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11526)
| -rw-r--r-- | Configurations/10-main.conf | 6 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 5baab6f306..895317dbb6 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1417,9 +1417,9 @@ my %targets = ( } push @ex_libs, '$(PORTSDK_LIBPATH)/portlib.lib' if (defined(env('PORTSDK_LIBPATH'))); - push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib' - if (env('TARGETCPU') eq "X86"); - return @ex_libs; + push @ex_libs, '/nodefaultlib coredll.lib corelibc.lib' + if (env('TARGETCPU') =~ /^X86|^ARMV4[IT]/); + return join(" ", @ex_libs); }), }, diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 107d0dc183..c2507a6508 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -264,8 +264,8 @@ CNF_CPPFLAGS={- our $cppfags2 = join(' ', $target{cppflags} || (), (map { '-D'.quotify1($_) } @{$target{defines}}, @{$config{defines}}), - (map { '-I'.quotify1($_) } @{$target{includes}}, - @{$config{includes}}), + (map { '-I'.'"'.$_.'"' } @{$target{includes}}, + @{$config{includes}}), @{$config{cppflags}}) -} CNF_CFLAGS={- join(' ', $target{cflags} || (), @{$config{cflags}}) -} |