Remove old cmake patch, dgit will regenerate it.

diff --git a/debian/patches/cmake-arm-version-hack.patch b/debian/patches/cmake-arm-version-hack.patch
deleted file mode 100644 (file)
index cae6aa7..0000000
--- a/debian/patches/cmake-arm-version-hack.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- /dev/null
-+++ llvm-toolchain-4.0-4.0.1/cmake/config.guess.hack
-@@ -0,0 +1,2 @@
-+#!/bin/bash -e
-+$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/
---- llvm-toolchain-4.0-4.0.1.orig/cmake/modules/GetHostTriple.cmake
-+++ llvm-toolchain-4.0-4.0.1/cmake/modules/GetHostTriple.cmake
-@@ -15,7 +15,7 @@ function( get_host_triple var )
-       set( value "i686-pc-mingw32" )
-     endif()
-   else( MSVC )
--    set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)
-+    set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack)
-     execute_process(COMMAND sh ${config_guess}
-       RESULT_VARIABLE TT_RV
-       OUTPUT_VARIABLE TT_OUT
---- llvm-toolchain-4.0-4.0.1.orig/compiler-rt/cmake/base-config-ix.cmake
-+++ llvm-toolchain-4.0-4.0.1/compiler-rt/cmake/base-config-ix.cmake
-@@ -170,8 +170,8 @@ macro(test_targets)
-       if(WIN32)
-         test_target_arch(arm "" "" "")
-       else()
--        test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
--        test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
-+        test_target_arch(arm "" "" "-mfloat-abi=soft")
-+        test_target_arch(armhf "" "" "-mfloat-abi=hard")
-       endif()
-     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
-       test_target_arch(aarch32 "" "-march=armv8-a")

diff --git a/debian/patches/series b/debian/patches/series
index b044259fc796ec1c5fb680375f8df628fac4608b..58de66c8db0a357452edcd6ade879b0bf527f911 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,5 +46,3 @@ disable-path-test-failing.diff
 silent-amd-tet.diff
 disable-error-xray.diff
 lldb-disable-swig-error.diff
-cmake-arm-version-hack.patch
-