Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use emcmake when building BoringSSL with Emscripten #602

Merged
merged 1 commit into from
Mar 10, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,14 @@ SHARED_EXT = dll
endif

ifdef IS_EMSCRIPTEN
# Recent versions of Emscripten toolchain provide new "emcmake" utility
# specifically for CMake. Older versions rely on generic "emconfigure".
ifeq ($(shell which emcmake >/dev/null 2>&1 && echo yes),yes)
CMAKE = emcmake cmake
else
CMAKE = emconfigure cmake
endif
endif

# Not all platforms include /usr/local into default search path
CFLAGS += -I/usr/local/include
Expand Down