diff options
| author | Robert Mustacchi <rm@joyent.com> | 2019-01-29 04:36:27 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2019-02-06 16:03:48 +0000 |
| commit | 2bd653815361427c17538380a0ae62a9a27120ff (patch) | |
| tree | 9de0da0f1bc6217ef3602246c684231eae36c464 /usr/src/tools/ctf/libctf | |
| parent | 908c640f41dd286bcc16fcf143d12430fb69895f (diff) | |
| download | illumos-joyent-2bd653815361427c17538380a0ae62a9a27120ff.tar.gz | |
OS-7549 Sync CTF review changes back
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: John Levon <john.levon@joyent.com>
Diffstat (limited to 'usr/src/tools/ctf/libctf')
| -rw-r--r-- | usr/src/tools/ctf/libctf/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/tools/ctf/libctf/Makefile.com | 11 | ||||
| -rw-r--r-- | usr/src/tools/ctf/libctf/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/tools/ctf/libctf/sparc/Makefile | 2 |
4 files changed, 5 insertions, 12 deletions
diff --git a/usr/src/tools/ctf/libctf/Makefile b/usr/src/tools/ctf/libctf/Makefile index 5e9236c43d..8ea6ae181f 100644 --- a/usr/src/tools/ctf/libctf/Makefile +++ b/usr/src/tools/ctf/libctf/Makefile @@ -28,7 +28,7 @@ include ../../Makefile.tools HDRS = libctf.h HDRDIR = common -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) all := TARGET = all clean := TARGET = clean diff --git a/usr/src/tools/ctf/libctf/Makefile.com b/usr/src/tools/ctf/libctf/Makefile.com index d932042f54..89769c5521 100644 --- a/usr/src/tools/ctf/libctf/Makefile.com +++ b/usr/src/tools/ctf/libctf/Makefile.com @@ -16,14 +16,6 @@ include $(SRC)/lib/libctf/Makefile.shared.com include ../../Makefile.ctf -# -# For some reason LDFLAGS doesn't seem to be taking effect at the -# moment. Therefore add what we need to LDLIBS for now. -# -LDLIBS += \ - -L$(ROOTONBLDLIBMACH) \ - '-R$$ORIGIN/../../lib/$(MACH)' \ - CSTD = $(CSTD_GNU99) C99LMODE = -Xc99=%all @@ -33,7 +25,8 @@ CPPFLAGS += -I$(SRC)/lib/libctf/common/ \ -include ../../common/ctf_headers.h \ -DCTF_OLD_VERSIONS \ -DCTF_TOOLS_BUILD -LDLIBS += -lc -lelf -ldwarf -lavl +LDLIBS += -lc -lelf -L$(ROOTONBLDLIBMACH) -ldwarf -lavl +DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)' .KEEP_STATE: diff --git a/usr/src/tools/ctf/libctf/i386/Makefile b/usr/src/tools/ctf/libctf/i386/Makefile index bb2f077f86..a926f22084 100644 --- a/usr/src/tools/ctf/libctf/i386/Makefile +++ b/usr/src/tools/ctf/libctf/i386/Makefile @@ -10,7 +10,7 @@ # # -# Copyright (c) 2015, Joyent, Inc. +# Copyright (c) 2015, Joyent, Inc. # include ../Makefile.com diff --git a/usr/src/tools/ctf/libctf/sparc/Makefile b/usr/src/tools/ctf/libctf/sparc/Makefile index bb2f077f86..a926f22084 100644 --- a/usr/src/tools/ctf/libctf/sparc/Makefile +++ b/usr/src/tools/ctf/libctf/sparc/Makefile @@ -10,7 +10,7 @@ # # -# Copyright (c) 2015, Joyent, Inc. +# Copyright (c) 2015, Joyent, Inc. # include ../Makefile.com |