summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorDarren J Moffat <darren.moffat@oracle.com>2022-11-04 16:21:57 +0000
committerTomas Mraz <tomas@openssl.org>2022-12-16 19:11:11 +0100
commitf5b06306b7727f830407c639f8a7bf1698f8aaa5 (patch)
treea32d7f2eb6be16bf009fea5072eae33a59893c63 /Configurations
parente8241fb6fe4e73bb337c9068e5a2421948ee40ad (diff)
19607 No need to link explicitly with libpthread on Solaris
CLA: trivial Reviewed-by: Zdenek.Kotal@oracle.com Reviewed-by: Ali.Bahrami@oracle.com Reviewed-by: Todd Short <todd.short@me.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19611)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf9
1 files changed, 1 insertions, 8 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 8f08fb8d9b..32ef7780fb 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -239,9 +239,7 @@ my %targets = (
CFLAGS => add_before(picker(default => "-Wall",
debug => "-O0 -g",
release => "-O3 -fomit-frame-pointer")),
- cflags => add(threads("-pthread")),
lib_cppflags => add("-DL_ENDIAN"),
- ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG",
shared_cflag => "-fPIC",
shared_ldflag => add_before("-shared -static-libgcc"),
@@ -262,9 +260,8 @@ my %targets = (
CFLAGS => add_before(picker(default => "-Wall",
debug => "-O0 -g",
release => "-O3")),
- cflags => add_before("-m64", threads("-pthread")),
+ cflags => add("-m64"),
lib_cppflags => add("-DL_ENDIAN"),
- ex_libs => add(threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG",
asm_arch => 'x86_64',
perlasm_scheme => "elf",
@@ -296,7 +293,6 @@ my %targets = (
lib_cppflags => add("-DL_ENDIAN"),
thread_scheme => "pthreads",
lflags => add(threads("-mt")),
- ex_libs => add(threads("-lpthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG",
asm_arch => 'x86_64',
perlasm_scheme => "elf",
@@ -312,9 +308,7 @@ my %targets = (
CFLAGS => add_before(picker(default => "-Wall",
debug => "-O0 -g",
release => "-O3")),
- cflags => add(threads("-pthread")),
lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"),
- ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-fPIC",
shared_ldflag => add_before("-shared -static-libgcc"),
@@ -353,7 +347,6 @@ my %targets = (
cppflags => add(threads("-D_REENTRANT")),
lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"),
lflags => add(threads("-mt")),
- ex_libs => add(threads("-lpthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-KPIC",
shared_ldflag => add_before("-G -dy -z text"),