about summary refs log tree commit diff
path: root/sysdeps/mach
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-08 09:52:29 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-08 09:52:29 -0500
commit2119dcfaccfa6fabf9e6be15f6d97ad041252ac9 (patch)
tree59aeb0bf04e9720306dcceb56074697c24116da0 /sysdeps/mach
parent121766a9d6295d1b3f33b2171c3ad234615627c3 (diff)
downloadglibc-2119dcfaccfa6fabf9e6be15f6d97ad041252ac9.tar.gz
glibc-2119dcfaccfa6fabf9e6be15f6d97ad041252ac9.tar.xz
glibc-2119dcfaccfa6fabf9e6be15f6d97ad041252ac9.zip
Static linking is always needed
Diffstat (limited to 'sysdeps/mach')
-rw-r--r--sysdeps/mach/hurd/Makefile13
1 files changed, 1 insertions, 12 deletions
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 93058ffaa2..36aebaa0c8 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -1,5 +1,4 @@
-# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009,2011
-#	Free Software Foundation, Inc.
+# Copyright (C) 1993-2004,2009,2011,2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -169,20 +168,10 @@ CFLAGS-dl-load.c = -DEXTERNAL_MAP_FROM_FD
 endif
 
 # We need these libs to link static programs in the libc source tree, too.
-ifeq (yes,$(build-static))
 link-libc-static := -Wl,-\( \
 		    $(patsubst %,$(common-objpfx)%.a,\
 			       libc mach/libmachuser hurd/libhurduser) \
 		    $(static-gnulib) -Wl,-\)
-else
-ifeq (yes,$(build-shared))
-# We can try to link the programs with lib*_pic.a...
-link-libc-static := $(link-libc) -Wl,-\( \
-		    $(patsubst %,$(common-objpfx)%_pic.a,\
-			       libc mach/libmachuser hurd/libhurduser) \
-		    $(static-gnulib) -Wl,-\)
-endif
-endif
 
 ifeq ($(subdir),csu)