diff options
author | dim <dim@FreeBSD.org> | 2014-02-26 22:26:40 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2014-02-26 22:26:40 +0000 |
commit | 09b56e694e5d4e67943f0d9c4668282053726b9f (patch) | |
tree | c09cd2cd8b06020ff76cb9b8f704cb7490621bcd /usr.bin | |
parent | 7d9059111716cc2ad4ad6f2782a9a03edcd2a81f (diff) | |
parent | 6765240e8d836b50e2135e928456ed8923b220ad (diff) | |
download | FreeBSD-src-09b56e694e5d4e67943f0d9c4668282053726b9f.zip FreeBSD-src-09b56e694e5d4e67943f0d9c4668282053726b9f.tar.gz |
Merge from head up to r262536.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/clang/lldb/Makefile | 5 | ||||
-rw-r--r-- | usr.bin/iscsictl/iscsictl.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index bde2bcf..95bb0f1 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -11,13 +11,13 @@ CXXFLAGS+= -std=c++11 SRCDIR= tools/lldb/tools/driver SRCS= Driver.cpp \ - IOChannel.cpp + Platform.cpp lldb.1: ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET} DPADD= ${LIBEDIT} ${LIBCURSES} ${LIBEXECINFO} -LDADD= -ledit -lcurses -lexecinfo +LDADD= -lcurses -ledit -lexecinfo -lpanel LLDB_LIBS=\ lldb \ @@ -53,6 +53,7 @@ LLDB_LIBS=\ lldbPluginProcessGDBRemote \ lldbPluginProcessUtility \ lldbPluginProcessPOSIX \ + lldbPluginProcessFreeBSD \ lldbPluginUnwindAssemblyInstEmulation \ lldbPluginUnwindAssemblyX86 diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c index d2db1b6..39a31c6 100644 --- a/usr.bin/iscsictl/iscsictl.c +++ b/usr.bin/iscsictl/iscsictl.c @@ -242,11 +242,6 @@ conf_verify(struct conf *conf) } if (targ->t_protocol == PROTOCOL_UNSPECIFIED) targ->t_protocol = PROTOCOL_ISCSI; -#ifndef ICL_KERNEL_PROXY - if (targ->t_protocol == PROTOCOL_ISER) - errx(1, "iSER support requires ICL_KERNEL_PROXY; " - "see iscsi(4) for details"); -#endif if (targ->t_address == NULL) errx(1, "missing TargetAddress for target \"%s\"", targ->t_nickname); |