Commit 68ab559a authored by Richard Levitte's avatar Richard Levitte
Browse files

Modernise the mingw cflags and ldflags 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent e737d7b1

Configurations/10-main.conf

+4 −4
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ 
    "mingw" => {

        inherit_from     => [ asm("x86_asm") ],

        cc               => "gcc",

        cflags           => "-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -march=i486 -Wall",

        cflags           => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall",

        debug_cflags     => "-g -O0",

        release_cflags   => "-O3 -fomit-frame-pointer",

        thread_cflag     => "-D_MT",
@@ -1173,7 +1173,7 @@ 
        dso_scheme       => "win32",

        shared_target    => "cygwin-shared",

        shared_cflag     => "-D_WINDLL -DOPENSSL_USE_APPLINK",

        shared_ldflag    => "-mno-cygwin",

        shared_ldflag    => "-static-libgcc",

        shared_extension => ".dll",

    },

    "mingw64" => {
@@ -1187,7 +1187,7 @@ 
        # Applink is never engaged and can as well be omitted.

        inherit_from     => [ asm("x86_64_asm") ],

        cc               => "gcc",

        cflags           => "-mno-cygwin -DL_ENDIAN -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE",

        cflags           => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m64 -Wall",

        debug_cflags     => "-g -O0",

        release_cflags   => "-O3",

        thread_cflag     => "-D_MT",
@@ -1198,7 +1198,7 @@ 
        dso_scheme       => "win32",

        shared_target    => "cygwin-shared",

        shared_cflag     => "-D_WINDLL",

        shared_ldflag    => "-mno-cygwin",

        shared_ldflag    => "-static-libgcc",

        shared_extension => ".dll",

    },

Configure

+3 −3
Original line number Diff line number Diff line
@@ -870,10 +870,10 @@ push @{$config{defines}}, 
    map { (my $x = $_) =~ s/^OPENSSL_NO_/OPENSSL_EXPERIMENTAL_/; $x }

        @{$config{openssl_experimental_defines}};



if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/-mno-cygwin/m)

if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` =~ m/-mno-cygwin/m)

	{

	$config{cflags} =~ s/-mno-cygwin\s*//;

	$target{shared_ldflag} =~ s/-mno-cygwin\s*//;

	$config{cflags} .= " -mno-cygwin";

	$target{shared_ldflag} .= " -mno-cygwin";

	}



if ($target =~ /linux.*-mips/ && !$no_asm && $user_cflags !~ /-m(ips|arch=)/) {