diff options
| author | wtc%google.com <devnull@localhost> | 2009-09-03 04:57:00 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-09-03 04:57:00 +0000 |
| commit | 98d4a3554473eefd04b3627b608de5a4882ec919 (patch) | |
| tree | 92bf95cb68bb50a239972081fd997d08a384a927 /security | |
| parent | 19fd96b7dbd8c3d320877caf907b8011de7b93ad (diff) | |
| download | nss-hg-98d4a3554473eefd04b3627b608de5a4882ec919.tar.gz | |
Bug 510435: Removed unused make variable DSO_LDFLAGS. r=christophe.ravel.
Modified Files:
BSD_OS.mk BeOS.mk HP-UX.mk Linux.mk NetBSD.mk OpenBSD.mk
OpenUNIX.mk QNX.mk RISCOS.mk SCO_SV3.2.mk
Diffstat (limited to 'security')
| -rw-r--r-- | security/coreconf/BSD_OS.mk | 4 | ||||
| -rw-r--r-- | security/coreconf/BeOS.mk | 2 | ||||
| -rw-r--r-- | security/coreconf/HP-UX.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/Linux.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/NetBSD.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/OpenBSD.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/OpenUNIX.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/QNX.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/RISCOS.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/SCO_SV3.2.mk | 1 |
10 files changed, 1 insertions, 13 deletions
diff --git a/security/coreconf/BSD_OS.mk b/security/coreconf/BSD_OS.mk index 06d6d2fff..95cb706ef 100644 --- a/security/coreconf/BSD_OS.mk +++ b/security/coreconf/BSD_OS.mk @@ -71,9 +71,7 @@ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -DBSD_OS -DBSDI -D ARCH = bsdos DSO_CFLAGS = -fPIC -DPIC -DSO_LDOPTS = -shared -DSO_LDFLAGS = -DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) ifdef LIBRUNPATH DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) diff --git a/security/coreconf/BeOS.mk b/security/coreconf/BeOS.mk index b42b71db9..269589191 100644 --- a/security/coreconf/BeOS.mk +++ b/security/coreconf/BeOS.mk @@ -77,5 +77,3 @@ ARCH = beos DSO_CFLAGS = -fPIC DSO_LDOPTS = -DSO_LDFLAGS = - diff --git a/security/coreconf/HP-UX.mk b/security/coreconf/HP-UX.mk index 41e8ed305..974b8317d 100644 --- a/security/coreconf/HP-UX.mk +++ b/security/coreconf/HP-UX.mk @@ -91,7 +91,6 @@ ifndef USE_64 RPATH = endif endif -DSO_LDFLAGS = # +Z generates position independent code for use in shared libraries. DSO_CFLAGS = +Z diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk index 5b054770f..3ecb584d4 100644 --- a/security/coreconf/Linux.mk +++ b/security/coreconf/Linux.mk @@ -150,7 +150,6 @@ DSO_LDOPTS = -shared $(ARCHFLAG) # we don't use -z defs there. ZDEFS_FLAG = -Wl,-z,defs DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -DSO_LDFLAGS = LDFLAGS += $(ARCHFLAG) # INCLUDES += -I/usr/include -Y/usr/include/linux diff --git a/security/coreconf/NetBSD.mk b/security/coreconf/NetBSD.mk index 4ad69c23a..551f10f14 100644 --- a/security/coreconf/NetBSD.mk +++ b/security/coreconf/NetBSD.mk @@ -66,7 +66,6 @@ ARCH = netbsd DSO_CFLAGS = -fPIC -DPIC DSO_LDOPTS = -shared -DSO_LDFLAGS = ifeq ($(OBJECT_FMT),ELF) DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) endif diff --git a/security/coreconf/OpenBSD.mk b/security/coreconf/OpenBSD.mk index 39e8f08b2..6ec4c347f 100644 --- a/security/coreconf/OpenBSD.mk +++ b/security/coreconf/OpenBSD.mk @@ -66,7 +66,6 @@ ARCH = openbsd DSO_CFLAGS = -fPIC -DPIC DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -DSO_LDFLAGS = MKSHLIB = $(CC) $(DSO_LDOPTS) diff --git a/security/coreconf/OpenUNIX.mk b/security/coreconf/OpenUNIX.mk index 5a38181ea..d48a12659 100644 --- a/security/coreconf/OpenUNIX.mk +++ b/security/coreconf/OpenUNIX.mk @@ -87,7 +87,6 @@ PROCESS_MAP_FILE = cp $< $@ BUILD_UNIX_PLUGINS = 1 #DSO_LDOPTS += -b elf -G -z defs DSO_LDOPTS += -G -DSO_LDFLAGS += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen # Used for Java compiler EXPORT_FLAGS += -W l,-Bexport diff --git a/security/coreconf/QNX.mk b/security/coreconf/QNX.mk index 79387799d..315bde463 100644 --- a/security/coreconf/QNX.mk +++ b/security/coreconf/QNX.mk @@ -69,4 +69,3 @@ ARCH = QNX DSO_CFLAGS = -Wc,-fPIC DSO_LDOPTS = -shared -DSO_LDFLAGS = diff --git a/security/coreconf/RISCOS.mk b/security/coreconf/RISCOS.mk index 867f5db89..29f420388 100644 --- a/security/coreconf/RISCOS.mk +++ b/security/coreconf/RISCOS.mk @@ -49,7 +49,6 @@ OS_TARGET = RISCOS DSO_CFLAGS = -fPIC DSO_LDOPTS = -shared -DSO_LDFLAGS = ifdef BUILD_OPT OPTIMIZER = -O3 diff --git a/security/coreconf/SCO_SV3.2.mk b/security/coreconf/SCO_SV3.2.mk index db9bec6a9..b2e4efcfa 100644 --- a/security/coreconf/SCO_SV3.2.mk +++ b/security/coreconf/SCO_SV3.2.mk @@ -87,7 +87,6 @@ PROCESS_MAP_FILE = cp $< $@ BUILD_UNIX_PLUGINS = 1 #DSO_LDOPTS += -b elf -G -z defs DSO_LDOPTS += -b elf -G -DSO_LDFLAGS += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen # Used for Java compiler EXPORT_FLAGS += -W l,-Bexport |