diff options
author | Richard Levitte <levitte@openssl.org> | 2016-03-14 10:02:13 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-14 11:21:35 +0100 |
commit | 01d9997659d910882790765f213f01e58b9f5cb1 (patch) | |
tree | 05d9c2f106c03ad87e874fdfd2677d4a168e55b4 /Configurations | |
parent | bae26b582e6cbff4bce5edc46907e6f331bc19e5 (diff) |
Fix a few Configure errors
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/10-main.conf | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index fa9af88e42..cddf268b67 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -52,8 +52,9 @@ sub vc_wince_info { my $wcelflag = "/subsystem:windowsce,$1.$2"; # ...,N.NN my $wceplatf = $ENV{'PLATFORM'}; - my $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d; - my $wcecdefs .= " -DWCE_PLATFORM_$wceplatf"; + + $wceplatf =~ tr/a-z0-9 /A-Z0-9_/; + $wcecdefs .= " -DWCE_PLATFORM_$wceplatf"; my $wcetgt = $ENV{'TARGETCPU'}; # just shorter name... SWITCH: for($wcetgt) { @@ -532,10 +533,10 @@ sub vc_wince_info { "hpux64-ia64-gcc" => { inherit_from => [ "BASE_unix", asm("ia64_asm") ], cc => "gcc", - cflags => picker(default => "-mlp64 -DB_ENDIAN", - debug => "-O0 -g", - release => "-O3", - threads("-pthread")), + cflags => combine(picker(default => "-mlp64 -DB_ENDIAN", + debug => "-O0 -g", + release => "-O3"), + threads("-pthread")), ex_libs => add("-ldl"), bn_ops => "SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", |