diff --git a/debian/changelog b/debian/changelog index 8097d9b9a..ae37ad7fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ cmake (2.8.1-0r1) UNRELEASED; urgency=low * Update debian/patches: - drop bootstraptest_increase_timeout.diff - merged upstream; - hurd_platform.diff - adapt to upstream changes. + * Forcefully set MINGW_CC_LINUX2WIN_EXECUTABLE to empty value. It breaks + otherwise valid Simple_Mingw_Linux2Win test when ccache is enabled. -- Modestas Vainius Sun, 06 Dec 2009 21:39:01 +0200 diff --git a/debian/rules b/debian/rules index ed0a9276f..1f6568aed 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ $(BUILD_FLAGS_FILE): # echo 'set(BUILD_WXDialog ON CACHE STRING "Build WXDialog" FORCE)' >> $@ echo 'set(BUILD_CursesDialog TRUE CACHE BOOL "Build curses GUI" FORCE)' >> $@ echo 'set(BUILD_QtDialog TRUE CACHE BOOL "Build Qt4 GUI" FORCE)' >> $@ + echo 'set(MINGW_CC_LINUX2WIN_EXECUTABLE "" CACHE FILEPATH "Never detect mingw" FORCE)' >> $@ # echo 'set(TARGET_VERSION CACHE STRING ""FORCE)' >> $@ # echo 'set(TARGET_SOVERSION CACHE STRING "" FORCE)' >> $@ # echo 'set(BUILD_DOCUMENTATION ON CACHE BOOL "" FORCE)' >> $@