summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjca <jca@openbsd.org>2019-01-03 21:49:22 +0000
committerjca <jca@openbsd.org>2019-01-03 21:49:22 +0000
commit431c05425921cf0b7394d69477db7fde58fd5f12 (patch)
tree32505279653a409af4bc502d4c468b3ad46e531e
parentRewrite the line filling function for terminal output yet again. (diff)
downloadwireguard-openbsd-431c05425921cf0b7394d69477db7fde58fd5f12.tar.xz
wireguard-openbsd-431c05425921cf0b7394d69477db7fde58fd5f12.zip
No support for vax any more, simplify setup.
-rwxr-xr-xusr.bin/libtool/libtool18
1 files changed, 4 insertions, 14 deletions
diff --git a/usr.bin/libtool/libtool b/usr.bin/libtool/libtool
index 6c792cb692d..7e6a5155eb1 100755
--- a/usr.bin/libtool/libtool
+++ b/usr.bin/libtool/libtool
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $OpenBSD: libtool,v 1.42 2014/03/19 02:16:22 afresh1 Exp $
+# $OpenBSD: libtool,v 1.43 2019/01/03 21:49:22 jca Exp $
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -52,24 +52,14 @@ sub new
ltdir => $ltdir,
version => $version,
objdir => $ltdir,
+ build_libtool_libs => 'no',
build_old_libs => 'yes',
pic_flags => join(' ', @picflags),
+ elf => 1,
+ noshared => 0,
}, $class;
($self->{gnu_arch} = $self->{machine_arch}) =~ s/amd64/x86_64/;
- if (grep { $_ eq $self->{machine_arch} } qw(vax)) {
- $self->{build_libtool_libs} = 'yes';
- $self->{noshared} = 1;
- } else {
- $self->{build_libtool_libs} = 'no';
- $self->{noshared} = 0;
- }
- if (grep { $_ eq $self->{machine_arch} } qw(vax)) {
- $self->{elf} = 0;
- } else {
- $self->{elf} = 1;
- }
-
return $self;
}