Skip to content

Commit 7db1e81

Browse files
committed
Tweak Makefile, mostly formatting
Signed-off-by: Martijn Stevenson <[email protected]>
1 parent 81c472c commit 7db1e81

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ else
44
CPP_CONTEXT_LIB = ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.cc
55
endif
66

7-
PROTOBUF?=none
7+
PROTOBUF ?= none
88
ifeq ($(PROTOBUF), full)
99
PROTO_DEPS := protobuf
1010
PROTO_OPTS := -DPROXY_WASM_PROTOBUF_FULL=1 \
@@ -20,13 +20,13 @@ else
2020
endif
2121

2222
# Provide a list of libraries that the wasm depends on (absl_*, re2, etc).
23-
WASM_DEPS?=absl_base
23+
WASM_DEPS ?=
2424

2525
# Determine dependency link options.
2626
# NOTE: Strip out -pthread which RE2 claims to need...
27-
PKG_CONFIG?=pkg-config
28-
PKG_CONFIG_PATH=${EMSDK}/upstream/emscripten/cache/sysroot/lib/pkgconfig
29-
WASM_LIBS=$(shell $(PKG_CONFIG) $(WASM_DEPS) $(PROTO_DEPS) \
27+
PKG_CONFIG ?= pkg-config
28+
PKG_CONFIG_PATH = ${EMSDK}/upstream/emscripten/cache/sysroot/lib/pkgconfig
29+
WASM_LIBS = $(shell $(PKG_CONFIG) $(WASM_DEPS) $(PROTO_DEPS) \
3030
--with-path=$(PKG_CONFIG_PATH) --libs | sed -e 's/-pthread //g')
3131

3232
debug-deps:
@@ -35,7 +35,7 @@ debug-deps:
3535
# PROTO_DEPS: ${PROTO_DEPS}
3636
# PROTO_OPTS: ${PROTO_OPTS}
3737

38-
# TODO(martijneken): Add Emscripten stack/heap size params.
38+
# TODO(mpwarres): Add Emscripten stack/heap size params in PR#174.
3939
%.wasm %.wat: %.cc
4040
em++ --no-entry -sSTANDALONE_WASM -sEXPORTED_FUNCTIONS=_malloc \
4141
--std=c++17 -O3 -flto \

0 commit comments

Comments
 (0)