diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-05-25 15:09:42 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-05-25 15:09:42 -0400 |
| commit | 32bcc42cee3ff3f288b99b3be95c437c3f278f6e (patch) | |
| tree | 7ed329fc1548f2dad25b798d0a64870d39de5ffd /usr/src/tools | |
| parent | 59b138baa75567bf292cecd61679cfd0538e2d0e (diff) | |
| parent | d8e10381a0083d7717710b0db7e64707bc0f3ff8 (diff) | |
| download | illumos-joyent-32bcc42cee3ff3f288b99b3be95c437c3f278f6e.tar.gz | |
[illumos-gate merge]
commit d8e10381a0083d7717710b0db7e64707bc0f3ff8
14683 remove SUNWonld vestiges from sgs
commit e9db39cef1f968a982994f50c05903cc988a3dd3
14682 remove prior-release portability from cmd/sgs
Conflicts:
usr/src/cmd/sgs/elfdump/Makefile.targ
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 |