diff options
| author | Ben Smith <binjimin@gmail.com> | 2017-08-28 10:59:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 10:59:50 -0700 |
| commit | 07ee60ee05957923101b96611b47bf2886b9ac54 (patch) | |
| tree | 9b121534a8f158cab4d7089f7e46394635deab87 /Makefile | |
| parent | 7223c1dc10ef63b884381df030ab1af760cbac91 (diff) | |
| download | wabt-07ee60ee05957923101b96611b47bf2886b9ac54.tar.gz wabt-07ee60ee05957923101b96611b47bf2886b9ac54.tar.bz2 wabt-07ee60ee05957923101b96611b47bf2886b9ac54.zip | |
Rename EMSCRIPTEN_DIR -> EMCC_DIR in Makefile (#597)
EMSCRIPTEN_DIR is meant to be the root directory to find the emscripten
binaries, and EMCC_DIR is meant to be the name of the subdirectory under
`out/` where emscripten build artifacts live.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -28,7 +28,7 @@ CMAKE_CMD ?= cmake DEFAULT_SUFFIX = clang-debug -COMPILERS := GCC GCC_I686 GCC_FUZZ CLANG EMSCRIPTEN +COMPILERS := GCC GCC_I686 GCC_FUZZ CLANG EMCC BUILD_TYPES := DEBUG RELEASE SANITIZERS := ASAN MSAN LSAN UBSAN CONFIGS := NORMAL $(SANITIZERS) COV NO_RE2C NO_TESTS @@ -38,7 +38,7 @@ GCC_DIR := gcc/ GCC_I686_DIR := gcc-i686/ GCC_FUZZ_DIR := gcc-fuzz/ CLANG_DIR := clang/ -EMSCRIPTEN_DIR := emscripten/ +EMCC_DIR := emscripten/ DEBUG_DIR := Debug/ RELEASE_DIR := Release/ NORMAL_DIR := @@ -56,7 +56,7 @@ GCC_I686_FLAG := -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 GCC_FUZZ_FLAG := -DCMAKE_C_COMPILER=${GCC_FUZZ_CC} -DCMAKE_CXX_COMPILER=${GCC_FUZZ_CXX} -DWITH_EXCEPTIONS=ON CLANG_FLAG := -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -EMSCRIPTEN_FLAG := -DCMAKE_TOOLCHAIN_FILE=${EMSCRIPTEN_DIR}/cmake/Modules/Platform/Emscripten.cmake +EMCC_FLAG := -DCMAKE_TOOLCHAIN_FILE=${EMSCRIPTEN_DIR}/cmake/Modules/Platform/Emscripten.cmake DEBUG_FLAG := -DCMAKE_BUILD_TYPE=Debug RELEASE_FLAG := -DCMAKE_BUILD_TYPE=Release NORMAL_FLAG := @@ -73,7 +73,7 @@ GCC_PREFIX := gcc GCC_I686_PREFIX := gcc-i686 GCC_FUZZ_PREFIX := gcc-fuzz CLANG_PREFIX := clang -EMSCRIPTEN_PREFIX := emscripten +EMCC_PREFIX := emscripten DEBUG_PREFIX := -debug RELEASE_PREFIX := -release NORMAL_PREFIX := |