From 291333af0cc5acb2ed17172bdc4a258d8f1fda44 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 21 Nov 2019 18:15:45 -0800
Subject: Add i686-clang build config (#1240)

We have an i686-gcc build already but it doesn't work on my local
machine.
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 60c56e25..94904d30 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ CMAKE_CMD ?= cmake
 
 DEFAULT_SUFFIX = clang-debug
 
-COMPILERS := GCC GCC_I686 GCC_FUZZ CLANG EMCC
+COMPILERS := GCC GCC_I686 GCC_FUZZ CLANG CLANG_I686 EMCC
 BUILD_TYPES := DEBUG RELEASE
 SANITIZERS := ASAN MSAN LSAN UBSAN
 CONFIGS := NORMAL $(SANITIZERS) COV NO_TESTS
@@ -38,6 +38,7 @@ GCC_DIR := gcc/
 GCC_I686_DIR := gcc-i686/
 GCC_FUZZ_DIR := gcc-fuzz/
 CLANG_DIR := clang/
+CLANG_I686_DIR := clang-i686/
 EMCC_DIR := emscripten/
 DEBUG_DIR := Debug/
 RELEASE_DIR := Release/
@@ -55,6 +56,8 @@ 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++
+CLANG_I686_FLAG := -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
+	-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32
 EMCC_FLAG := -DCMAKE_TOOLCHAIN_FILE=${EMSCRIPTEN_DIR}/cmake/Modules/Platform/Emscripten.cmake
 DEBUG_FLAG := -DCMAKE_BUILD_TYPE=Debug
 RELEASE_FLAG := -DCMAKE_BUILD_TYPE=Release
@@ -71,6 +74,7 @@ GCC_PREFIX := gcc
 GCC_I686_PREFIX := gcc-i686
 GCC_FUZZ_PREFIX := gcc-fuzz
 CLANG_PREFIX := clang
+CLANG_I686_PREFIX := clang-i686
 EMCC_PREFIX := emscripten
 DEBUG_PREFIX := -debug
 RELEASE_PREFIX := -release
-- 
cgit v1.2.3