Commit 8864f0de authored by Richard Levitte's avatar Richard Levitte
Browse files

Configure - get rid of the special debug_ and release_ settings 



Instead, make the build type ("debug" or "release") available through
$config{build_type} and let the configs themselves figure out what the
usual settings (such as "cflags", "lflags" and so on) should be
accordingly.

The benefit with this is that we can now have debug and release
variants of any setting, not just those Configure supports, and may
also involve other factors (the MSVC flags /MD[d] and /MT[d] involve
both build type and whether threading is enabled or not)

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 940a09ba

Configurations/00-base-templates.conf

+0 −4
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ 


	cflags		=> "",

	defines		=> [],

	debug_cflags	=> "",

	debug_defines	=> [],

	release_cflags	=> "",

	release_defines => [],

	thread_cflags	=> "",

	thread_defines	=> [],

Configurations/10-main.conf

+154 −149

File changed.

Preview size limit exceeded, changes collapsed.

Configurations/99-personal-levitte.conf

+12 −4
Original line number Diff line number Diff line 
## -*- mode: perl; -*-

## Personal configuration targets



sub picker {

    my %opts = @_;

    return sub { add($opts{default} || (),

                     $opts{$config{build_type}} || ())->(); }

}



%targets = (

    "levitte-linux-elf" => {

        inherit_from     => [ "linux-elf" ],

        debug_cflags     => add("-ggdb -g3"),

        debug_defines    => add("LEVITTE_DEBUG", { separator => undef }),

        cflags           => add(picker(debug => "-ggdb -g3")),

        defines          => add(picker(debug => "LEVITTE_DEBUG"),

                                { separator => undef }),

        build_scheme     => [ "unified", "unix" ],

        build_file       => "Makefile",

    },

    "levitte-linux-x86_64" => {

        inherit_from     => [ "linux-x86_64" ],

        debug_cflags     => add("-ggdb -g3"),

        debug_defines    => add("LEVITTE_DEBUG", { separator => undef }),

        cflags           => add(picker(debug => "-ggdb -g3")),

        defines          => add(picker(debug => "LEVITTE_DEBUG"),

                                { separator => undef }),

        build_scheme     => [ "unified", "unix" ],

        build_file       => "Makefile",

    },

Configure

+7 −22
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ $config{openssl_other_defines}=[]; 
my $libs="";

my $target="";

$config{options}="";

my $build_prefix = "release_";

$config{build_type} = "release";



my @argvcopy=@ARGV;
@@ -591,11 +591,11 @@ foreach (@argvcopy) 
		}

	elsif (/^--debug$/)

		{

		$build_prefix = "debug_";

		$config{build_type} = "debug";

		}

	elsif (/^--release$/)

		{

		$build_prefix = "release_";

		$config{build_type} = "release";

		}

	elsif (/^386$/)

		{ $config{processor}=386; }
@@ -826,7 +826,7 @@ print "Configuring for $target\n"; 
# Support for legacy targets having a name starting with 'debug-'

my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;

if ($d) {

    $build_prefix = "debug_";

    $config{build_type} = "debug";



    # If we do not find debug-foo in the table, the target is set to foo.

    if (!$table{$target}) {
@@ -866,14 +866,9 @@ $target{nm} = $ENV{'NM'} || $target{nm} || "nm"; 
# For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_

# or release_ attributes.

# Do it in such a way that no spurious space is appended (hence the grep).

$config{defines} = [ @{$target{defines}},

                     @{$target{$build_prefix."defines"}} ];

$config{cflags} = join(" ",

		       grep { $_ ne "" } ($target{cflags},

					  $target{$build_prefix."cflags"}));

$config{ex_libs} = join(" ",

			grep { $_  ne "" } ($target{ex_libs},

					    $target{$build_prefix."ex_libs"}));

$config{defines} = $target{defines} || [];

$config{cflags} = $target{cflags} || "";

$config{ex_libs} = $target{ex_libs} || "";



# Make sure build_scheme is consistent.

$target{build_scheme} = [ $target{build_scheme} ]
@@ -2172,22 +2167,12 @@ sub print_table_entry 
	"cc",

	"cflags",

	"defines",

	"debug_cflags",

	"debug_defines",

	"release_cflags",

	"release_defines",

	"thread_cflag",

	"unistd",

	"ld",

	"lflags",

	"plib_lflags",

	"ex_libs",

	"debug_lflags",

	"debug_plib_lflags",

	"debug_ex_libs",

	"release_lflags",

	"release_plib_lflags",

	"release_ex_libs",

	"bn_ops",

	"cpuid_obj",

	"bn_obj",