fix patch command, disable i386 for C compiler too

skvark · skvark · commit 0c70a92a78c3 · 2017-08-10T21:22:01.000+03:00
diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh
@@ -14,7 +14,7 @@ cd opencv
 
 echo "Apply patch"
 
-git apply ../travis/disable_i386.patch
+git apply --ignore-space-change --ignore-whitespace ../travis/disable_i386.patch
 
 echo 'Config make'
 
diff --git a/travis/disable_i386.patch b/travis/disable_i386.patch
@@ -1,12 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index af5e2c1..4ef83c1 100644
+index af5e2c1..cee9726 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -192,6 +192,8 @@ if(MINGW)
+@@ -192,6 +192,9 @@ if(MINGW)
    endif()
  endif()
  
 +string(REPLACE "-arch i386" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++string(REPLACE "-arch i386" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 +
  # ----------------------------------------------------------------------------
  # OpenCV cmake options
