summaryrefslogtreecommitdiffstats
path: root/Configurations/10-main.conf
diff options
context:
space:
mode:
authoraSoujyuTanaka <soujyu.tanaka@access-company.com>2020-04-12 04:00:17 +0900
committerRichard Levitte <levitte@openssl.org>2020-07-15 23:06:13 +0200
commitbe4c4237ce26d1f484add07e6e34e2650c7b7102 (patch)
treee9822dc42a156bd497beea4b7fa5f518a26b0e6b /Configurations/10-main.conf
parent88bc70366b0cfd77616083c550a40fb0f84c5379 (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) (cherry picked from commit a1736f37aee855fecf463b9f15519e12c333ecfc)
Diffstat (limited to 'Configurations/10-main.conf')
-rw-r--r--Configurations/10-main.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 3b07731db8..eb92c24f48 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1365,9 +1365,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);
}),
},