Bug 510435: Removed unused make variable DSO_LDFLAGS. r=christophe.ra…

…vel. 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
sailfishos-mirror · Sep 3, 2009 · b4bd775 · b4bd775
1 parent 36390b8
commit b4bd775
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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