Configurations/unix-Makefile.tmpl: remove assignment of AS and ASFLAGS

[openssl.git] / Configure

diff --git a/Configure b/Configure
index fb0534a7d79f422947b08794b08a913a74bbaadd..6f70e1892088899344cde68c13339eaa22d72c4a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -2444,6 +2444,7 @@ _____
             my $prefix = '';
             $prefix = $config{cross_compile_prefix}
                 if grep { $var eq $_ } @user_crossable;
+            $prefix //= '';
             print '    ',$var,' ' x (16 - length $var),'= ',
                 (ref $config{$makevars{$var}} eq 'ARRAY'
                  ? join(' ', @{$config{$makevars{$var}}})
@@ -2603,17 +2604,6 @@ my %builders = (
 
 $builders{$builder}->($builder_platform, @builder_opts);
 
-# Show a note on the use of configdata.pm, but ONLY for release 1.1.1
-# (i.e. this message disappears with the following update, 1.1.1a)
-print <<"EOF" if ($config{version_num} =~ m|^0x1010100.L$|);
-
-NOTE: Starting with OpenSSL 1.1.1, 'Configure' doesn't display all the disabled
-options or the "make variables" with their values.  Instead, you must use
-'configdata.pm' as a script to get a display of the configuration data.  For
-help, please do this:
-
-        perl configdata.pm --help
-EOF
 print <<"EOF" if ($disabled{threads} eq "unavailable");
 
 The library could not be configured for supporting multi-threaded
@@ -2638,6 +2628,18 @@ safest course of action is to clean the source directory and redo this
 configuration.
 EOF
 
+print <<"EOF";
+
+**********************************************************************
+***                                                                ***
+***   If you want to report a building issue, please include the   ***
+***   output from this command:                                    ***
+***                                                                ***
+***     perl configdata.pm --dump                                  ***
+***                                                                ***
+**********************************************************************
+EOF
+
 exit(0);
 
 ######################################################################
@@ -3006,7 +3008,7 @@ sub compiler_predefined {
 
     return () if $^O eq 'VMS';
 
-    die 'compiler_predefines called without a default compiler'
+    die 'compiler_predefined called without a default compiler'
         unless $default_compiler;
 
     if (! $predefined{$default_compiler}) {