diff options
| author |  ctiller <ctiller@google.com> | 2015-01-07 15:33:00 -0800 |
|---|---|---|
| committer |  Nicolas Noble <nnoble@google.com> | 2015-01-09 17:30:09 -0800 |
| commit | c008ae5e506b7d92137d1b905117fc887036e701 (patch) | |
| tree | d552273e1c193dd9e114d36ab08b4839df38473d /templates | |
| parent | d9962df7a5c38d21b1413ae6ab830d671ae2cb26 (diff) | |
Fix opensource build.
Change on 2015/01/07 by ctiller <ctiller@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=83469328
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index bdb9765114..44144c8f7e 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -100,7 +100,7 @@ CPPFLAGS += -g -fPIC -Wall -Werror -Wno-long-long LDFLAGS += -g -pthread -fPIC INCLUDES = . include gens -LIBS = rt m z event event_pthreads pthread +LIBS = rt m z pthread LIBSXX = protobuf LIBS_PROTOC = protoc protobuf @@ -159,20 +159,12 @@ else IS_GIT_FOLDER = true endif -EVENT2_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o /dev/null test/build/event2.c -levent $(LDFLAGS) OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o /dev/null test/build/openssl-alpn.c -lssl -lcrypto -ldl $(LDFLAGS) ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o /dev/null test/build/zlib.c -lz $(LDFLAGS) -HAS_SYSTEM_EVENT2 = $(shell $(EVENT2_CHECK_CMD) 2> /dev/null && echo true || echo false) HAS_SYSTEM_OPENSSL_ALPN = $(shell $(OPENSSL_ALPN_CHECK_CMD) 2> /dev/null && echo true || echo false) HAS_SYSTEM_ZLIB = $(shell $(ZLIB_CHECK_CMD) 2> /dev/null && echo true || echo false) -ifeq ($(wildcard third_party/libevent/include/event2/event.h),) -HAS_EMBEDDED_EVENT2 = false -else -HAS_EMBEDDED_EVENT2 = true -endif - ifeq ($(wildcard third_party/openssl/ssl/ssl.h),) HAS_EMBEDDED_OPENSSL_ALPN = false else @@ -185,12 +177,6 @@ else HAS_EMBEDDED_ZLIB = true endif -ifneq ($(SYSTEM),MINGW32) -ifeq ($(HAS_SYSTEM_EVENT2),false) -DEP_MISSING += libevent -endif -endif - ifeq ($(HAS_SYSTEM_ZLIB),false) ifeq ($(HAS_EMBEDDED_ZLIB),true) ZLIB_DEP = third_party/zlib/libz.a @@ -291,7 +277,6 @@ ${tgt.name}: bins/$(CONFIG)/${tgt.name} % endfor run_dep_checks: - $(EVENT2_CHECK_CMD) || true $(OPENSSL_ALPN_CHECK_CMD) || true $(ZLIB_CHECK_CMD) || true |