Skip to content

Commit

Permalink
13267 tools libld build picks up normal sgs libs
Browse files Browse the repository at this point in the history
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
  • Loading branch information
rmustacc committed Nov 4, 2020
1 parent 6f9fa98 commit 90f7985
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion usr/src/tools/sgs/libld/Makefile
Expand Up @@ -31,12 +31,19 @@ include $(SGSHOME)/libld/Makefile.com

.KEEP_STATE:

#
# By using libld's Makefile.com LDLIBS ends up pointing to the proto
# area and many of the directories of cmd/sgs. As such, we need to reset
# that and just make sure to find everything relative to the tools proto
# area.
#
LDLIBS =
CW_LINKER =

CPPFLAGS = $(NATIVE_CPPFLAGS) -DUSE_LIBLD_MALLOC -I$(SRC)/lib/libc/inc \
-I$(SRC)/uts/common/krtld -I$(SRC)/uts/sparc \
$(VAR_LIBLD_CPPFLAGS)
LDLIBS += -L$(ROOTONBLDLIBMACH) -L../libconv -lconv -llddbg -lelf -lc
LDLIBS += -L../libconv -lconv -L$(ROOTONBLDLIBMACH) -llddbg -lelf -lc
NATIVE_LIBS += libc.so

DYNFLAGS += $(VERSREF) '-R$$ORIGIN'
Expand Down

0 comments on commit 90f7985

Please sign in to comment.