[COMMIT osv master] Removed remains of externals reference from httpserver-api Makefile

5 views
Skip to first unread message

Commit Bot

unread,
Jul 29, 2019, 10:07:48 PM7/29/19
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

Removed remains of externals reference from httpserver-api Makefile

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/modules/httpserver-api/Makefile
b/modules/httpserver-api/Makefile
--- a/modules/httpserver-api/Makefile
+++ b/modules/httpserver-api/Makefile
@@ -20,8 +20,6 @@ endif
ifndef OSV_BUILD_PATH
OSV_BUILD_PATH = $(src)/build/$(mode).$(ARCH)
endif
-miscbase = $(src)/external/$(ARCH)/misc.bin
-libs-dir = $(miscbase)/usr/lib64
boost-libs := -lboost_system -lboost_filesystem

# the build target executable:
@@ -35,12 +33,7 @@ STUB_FILES := $(addprefix obj/,$(STUB_CPP_FILES:.cc=.o))

DYN_LIBS = -lpthread -ldl -L../libtools -ltools $(boost-libs) -lyaml-cpp

-ifeq ($(use_host),y)
- DYN_LIBS += -lssl -lcrypto
-else
- DYN_LIBS += $(libs-dir)/libssl.so.10 \
- $(libs-dir)/libcrypto.so.10
-endif
+DYN_LIBS += -lssl -lcrypto

LIBS = $(DYN_LIBS) $(STATIC_LIBS)

Reply all
Reply to author
Forward
0 new messages