diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-18 18:43:56 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-19 11:06:54 +0100 |
| commit | 3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee (patch) | |
| tree | 59e5462b3f76ce4de66c9b5dc8243f5d8f632670 /Configurations/10-main.conf | |
| parent | 5be5e56c09015633d94fb1ee1290081a78074546 (diff) | |
Rethink the uplink / applink story
Adding uplink and applink to some builds was done by "magic", the
configuration for "mingw" only had a macro definition, the Configure
would react to its presence by adding the uplink source files to
cpuid_asm_src, and crypto/build.info inherited dance to get it
compiled, and Makefile.shared made sure applink.o would be
appropriately linked in. That was a lot under the hood.
To replace this, we create a few template configurations in
Configurations/00-base-templates.conf, inherit one of them in the
"mingw" configuration, the rest is just about refering to the
$target{apps_aux_src} / $target{apps_obj} in the right places.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 03dc56bde1..4372d92614 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1162,7 +1162,8 @@ #### MinGW "mingw" => { - inherit_from => [ asm("x86_asm") ], + inherit_from => [ asm("x86_asm"), + sub { $config{no_shared} ? () : "x86_uplink" } ], cc => "gcc", cflags => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall", debug_cflags => "-g -O0", @@ -1174,7 +1175,7 @@ perlasm_scheme => "coff", dso_scheme => "win32", shared_target => "cygwin-shared", - shared_cflag => "-D_WINDLL -DOPENSSL_USE_APPLINK", + shared_cflag => add(" ", "-D_WINDLL"), shared_ldflag => "-static-libgcc", shared_rcflag => "--target=pe-i386", shared_extension => ".dll", @@ -1200,7 +1201,7 @@ perlasm_scheme => "mingw64", dso_scheme => "win32", shared_target => "cygwin-shared", - shared_cflag => "-D_WINDLL", + shared_cflag => add(" ", "-D_WINDLL"), shared_ldflag => "-static-libgcc", shared_rcflag => "--target=pe-x86-64", shared_extension => ".dll", |