27 lines
1021 B
Diff
27 lines
1021 B
Diff
host_tools.patch
|
|
|
|
Support shadow build of the host tools when the source tree already
|
|
contains generated files.
|
|
|
|
diff --git a/qtbase/configure b/qtbase/configure
|
|
index ef7bad1..3bd39ed 100755
|
|
--- a/qtbase/configure
|
|
+++ b/qtbase/configure
|
|
@@ -673,11 +673,11 @@ if [ "$OPT_SHADOW" = "maybe" ]; then
|
|
fi
|
|
fi
|
|
if [ "$OPT_SHADOW" = "yes" ]; then
|
|
- if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then
|
|
- echo >&2 "You cannot make a shadow build from a source tree containing a previous build."
|
|
- echo >&2 "Cannot proceed."
|
|
- exit 1
|
|
- fi
|
|
+ #if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then
|
|
+ #echo >&2 "You cannot make a shadow build from a source tree containing a previous build."
|
|
+ #echo >&2 "Cannot proceed."
|
|
+ #exit 1
|
|
+ #fi
|
|
[ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
|
|
fi
|
|
|