===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkg-config/pkg-config,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** src/usr.bin/pkg-config/pkg-config	2011/07/08 18:57:41	1.69
--- src/usr.bin/pkg-config/pkg-config	2011/11/17 11:37:16	1.70
***************
*** 1,5 ****
  #!/usr/bin/perl
! # $OpenBSD: pkg-config,v 1.69 2011/07/08 18:57:41 jasper Exp $
  # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $
  
  # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
--- 1,5 ----
  #!/usr/bin/perl
! # $OpenBSD: pkg-config,v 1.70 2011/11/17 11:37:16 jasper Exp $
  # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $
  
  # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
***************
*** 19,24 ****
--- 19,25 ----
  
  use strict;
  use warnings;
+ use Config;
  use Getopt::Long;
  use File::Basename;
  use File::stat;
***************
*** 104,109 ****
--- 105,121 ----
  		'define-variable=s' 	=> $variables,
  	);
  
+ # Unconditionally switch to static mode on static arches as --static
+ # may not have been passed explicitly, but we don't want to re-order
+ # and simplify the libs like we do for shared architectures.
+ {
+ 	my @static_archs = qw(m88k vax);
+ 	my $machine_arch = $Config{'ARCH'};
+ 	if (grep { $_ eq $machine_arch } @static_archs){
+ 		$mode{static} = 1;
+ 	}
+ }
+ 
  # Initial value of printerr depends on the options...
  if (!defined $mode{printerr}) {
  	if (defined $mode{libs}
***************
*** 208,214 ****
  	}
  }
  
! my $dep_cfg_list = simplify_and_reverse($cfg_full_list);
  
  if ($mode{cflags} || $mode{libs} || $mode{variable}) {
  	push @vlist, do_cflags($dep_cfg_list) if $mode{cflags};
--- 220,230 ----
  	}
  }
  
! my $dep_cfg_list = $cfg_full_list;
! 
! if (!$mode{static}){
! 	$dep_cfg_list = simplify_and_reverse($cfg_full_list);
! }
  
  if ($mode{cflags} || $mode{libs} || $mode{variable}) {
  	push @vlist, do_cflags($dep_cfg_list) if $mode{cflags};