diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2022-04-05 16:21:15 -0500 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2022-05-24 16:05:48 -0500 |
| commit | e9db39cef1f968a982994f50c05903cc988a3dd3 (patch) | |
| tree | d6fdc9224b45c55a08ca8dbb9fba558bf53d5477 /usr/src/tools | |
| parent | a3bac573c955fec12942b4bfa5d10b68931210cb (diff) | |
| download | illumos-joyent-e9db39cef1f968a982994f50c05903cc988a3dd3.tar.gz | |
14682 remove prior-release portability from cmd/sgs
Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Approved by: Dan McDonald <danmcd@mnx.io>
Diffstat (limited to 'usr/src/tools')
| -rw-r--r-- | usr/src/tools/sgs/ld/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/tools/sgs/libld/Makefile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/tools/sgs/ld/Makefile b/usr/src/tools/sgs/ld/Makefile index 18b4659d59..05ce16f7a6 100644 --- a/usr/src/tools/sgs/ld/Makefile +++ b/usr/src/tools/sgs/ld/Makefile @@ -31,9 +31,8 @@ NATIVE_LIBS += libc.so libumem.so CPPFLAGS = $(NATIVE_CPPFLAGS) CFLAGS = $(NATIVE_CFLAGS) MAPFILES = $(SRCDIR)/common/mapfile-intf +RPATH = '-R$$ORIGIN/../../lib/$(MACH)' CW_LINKER = -VAR_LD_LLDFLAGS= '-R$$ORIGIN/../../lib/$(MACH)' -VAR_LD_LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' install: $(ROOTONBLDMACHPROG) diff --git a/usr/src/tools/sgs/libld/Makefile b/usr/src/tools/sgs/libld/Makefile index 6897a0b18d..956a85c482 100644 --- a/usr/src/tools/sgs/libld/Makefile +++ b/usr/src/tools/sgs/libld/Makefile @@ -42,7 +42,7 @@ 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) + -I$(SRC)/uts/common LDLIBS += -L../libconv -lconv -L$(ROOTONBLDLIBMACH) -llddbg -lelf -lc NATIVE_LIBS += libc.so |