commit f1d777c71f032015bd047ba0460e22df57e3eb8e
author Nicolas Capens <capn@google.com> Mon Oct 01 12:38:38 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Mon Oct 01 18:46:33 2018 +0000
tree 30e4928965d96e17e5c125b604c632d67ca34893
parent 810f3db8264a911566fb7fd84970bc93e47b8726

Remove duplicates in LLVM 7.0 build.

Bug b/115344057

Change-Id: Iac34e89f56a1f67301beae3fcf492596522d08a2
Reviewed-on: https://swiftshader-review.googlesource.com/21168
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa05ee2..0e34e76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1294,7 +1294,6 @@
     ${LLVM_DIR}/lib/Support/raw_ostream.cpp
     ${LLVM_DIR}/lib/Support/regcomp.c
     ${LLVM_DIR}/lib/Support/regerror.c
-    ${LLVM_DIR}/lib/Support/regerror.c
     ${LLVM_DIR}/lib/Support/regexec.c
     ${LLVM_DIR}/lib/Support/regfree.c
     ${LLVM_DIR}/lib/Support/regstrlcpy.c

third_party/llvm-7.0/Android.mk

diff --git a/third_party/llvm-7.0/Android.mk b/third_party/llvm-7.0/Android.mk
index b38298a..a8918e6 100644
--- a/third_party/llvm-7.0/Android.mk
+++ b/third_party/llvm-7.0/Android.mk
@@ -666,7 +666,6 @@
 	llvm/lib/Support/raw_ostream.cpp \
 	llvm/lib/Support/regcomp.c \
 	llvm/lib/Support/regerror.c \
-	llvm/lib/Support/regerror.c \
 	llvm/lib/Support/regexec.c \
 	llvm/lib/Support/regfree.c \
 	llvm/lib/Support/regstrlcpy.c \