diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-19 15:17:11 -0400 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-19 15:17:11 -0400 |
commit | 795f41c331a8ba15fbeb6f89d2c3349ceeda8b58 (patch) | |
tree | 8bcec5551b8a71f80792859aa4e719639083c76b | |
parent | d8d71df30164d13cd325b566292683f7da8cca7f (diff) | |
download | infinitytier-795f41c331a8ba15fbeb6f89d2c3349ceeda8b58.tar.gz infinitytier-795f41c331a8ba15fbeb6f89d2c3349ceeda8b58.zip |
Change Linux default build back to debug, and fix startup message. Oh, and new crypto just kinda works. Awesome.
-rw-r--r-- | Makefile.linux | 8 | ||||
-rw-r--r-- | node/Node.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.linux b/Makefile.linux index 1f27194a..353b8721 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -6,12 +6,12 @@ ARCH=$(shell uname -m) DEFS=-DZT_ARCH="$(ARCH)" -DZT_OSNAME="linux" -DZT_TRACE # Uncomment for a release optimized build -CFLAGS=-Wall -O3 -fno-unroll-loops -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS) -STRIP=strip --strip-all +#CFLAGS=-Wall -O3 -fno-unroll-loops -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS) +#STRIP=strip --strip-all # Uncomment for a debug build -#CFLAGS=-Wall -g -pthread $(INCLUDES) -DZT_TRACE $(DEFS) -#STRIP=echo +CFLAGS=-Wall -g -pthread $(INCLUDES) -DZT_TRACE $(DEFS) +STRIP=echo CXXFLAGS=$(CFLAGS) -fno-rtti diff --git a/node/Node.cpp b/node/Node.cpp index 3da98223..781a744e 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -312,7 +312,7 @@ Node::ReasonForTermination Node::run() _r->log = new Logger((_r->homePath + ZT_PATH_SEPARATOR_S + "node.log").c_str(),(const char *)0,131072); #endif - LOG("%s starting version %s",_r->identity.address().toString().c_str(),versionString()); + LOG("starting version %s",versionString()); // Create non-crypto PRNG right away in case other code in init wants to use it _r->prng = new CMWC4096(); |