blob: 66daaf84b98f2efc65d556b18882d1d00ddf70fa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
Index: b/usr/src/cmd/sgs/ldd/Makefile.com
===================================================================
--- a/usr/src/cmd/sgs/ldd/Makefile.com
+++ b/usr/src/cmd/sgs/ldd/Makefile.com
@@ -35,16 +35,15 @@ TOOLSOBJ= alist.o
OBJS= $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
-MAPFILE= $(MAPFILE.NGB)
+MAPFILE=
MAPOPTS= $(MAPFILE:%=-M%)
CPPFLAGS += -I. -I../../include -I../../include/$(MACH) \
-I$(SRCBASE)/uts/$(ARCH)/sys \
$(CPPFLAGS.master)
-LLDFLAGS = '-R$$ORIGIN/../../lib'
-LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)'
LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
-LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB)
+# libconv.a should be installed:
+LDLIBS += -lconv -lelf $(DLLIB)
LINTFLAGS += -x
LINTFLAGS64 += -x
|