diff options
| author | Keith M Wesolowski <keith.wesolowski@joyent.com> | 2012-05-09 21:48:25 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <keith.wesolowski@joyent.com> | 2012-05-11 03:39:50 +0000 |
| commit | 97cb81c3e7039cbccd8eed95620f272fcc6d40c1 (patch) | |
| tree | e9c9c8a5de69dacde955904a5a779b60df970c4e /usr/src | |
| parent | 174e8b3ce87f5af2cde5c9f11aa56e1217071447 (diff) | |
| download | illumos-joyent-97cb81c3e7039cbccd8eed95620f272fcc6d40c1.tar.gz | |
OS-1081 /usr/gnu contents are severely broken wrt ISA
OS-1121 platform delivers unwanted compilation symlinks
OS-1123 libstdc++ and libgcc_s should move to /usr
1168 want a libtermcap that does not force libcurses
2698 libctf should use libz.so.1, not libz.so
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/Makefile.master | 2 | ||||
| -rw-r--r-- | usr/src/lib/libctf/common/ctf_lib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index f1942610d4..b2c8f750a6 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -665,7 +665,7 @@ COMPILE.java= $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH) # Link time macros # CCNEEDED = -lC -$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ -lgcc_s +$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) diff --git a/usr/src/lib/libctf/common/ctf_lib.c b/usr/src/lib/libctf/common/ctf_lib.c index 6e599540a4..03eb55b6e6 100644 --- a/usr/src/lib/libctf/common/ctf_lib.c +++ b/usr/src/lib/libctf/common/ctf_lib.c @@ -37,9 +37,9 @@ #include <gelf.h> #ifdef _LP64 -static const char *_libctf_zlib = "/usr/lib/64/libz.so"; +static const char *_libctf_zlib = "/usr/lib/64/libz.so.1"; #else -static const char *_libctf_zlib = "/usr/lib/libz.so"; +static const char *_libctf_zlib = "/usr/lib/libz.so.1"; #endif static struct { |