Fix a few Configure errors

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index fa9af88e421b8223246f6b4aa5188e3c77a8c3ae..cddf268b6746e13b907da24d8bbf76896f2ff061 100644 (file)
--- 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 $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) {
 
         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",
     "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",
         ex_libs          => add("-ldl"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         thread_scheme    => "pthreads",