[Libreoffice-commits] .: 2 commits - bootstrap.1 soltools/checkdll

[Tor Lillqvist]

 bootstrap.1                   |   12 +++++++++---
 soltools/checkdll/makefile.mk |    4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 86c4ca930d8aaffcca8c12c416bd9e8d6aeede23
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 23:49:09 2011 +0300

    Don't build checkdll when cross-compiling

diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index 51e7d59..c145d07 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -40,7 +40,7 @@ NO_DEFAULT_STL=TRUE
 # --- Files --------------------------------------------------------
 
 
-.IF "$(GUI)"=="UNX" && "$(OS)"!="IOS"
+.IF "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"==""
 LIBSALCPPRT=$(0)
 APP1TARGET	= 	checkdll
 APP1OBJS	=	$(OBJ)$/checkdll.obj
@@ -52,7 +52,7 @@ STDLIB += -ldl
 .IF "$(OS)"=="NETBSD"
 APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
 .ENDIF
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"==""
 
 # --- Targets ------------------------------------------------------
 
commit 43ffcf6ab27bf5e6a67992462f06c5257ff7fd3a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 23:46:59 2011 +0300

    Use the build platform compiler for dmake when cross-compiling
    
    Except when cross-compiling from Windows (yeah... not bloody likely
    anybody would be silly enough to do that...), then use the Cygwin gcc.

diff --git a/bootstrap.1 b/bootstrap.1
index e2accf3..7a524d3 100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -18,9 +18,15 @@ if test "$BUILD_DMAKE" != "NO"; then
         cd "$SRC_ROOT/dmake" || exit
 
 	# If cross-compiling then don't use the cross compilers to build dmake.
-	if test "$CROSS_COMPILING" = "YES"; then
-            CC=""
-            CXX=""
+        if test "$CROSS_COMPILING" = "YES"; then
+            if test "$GUI_FOR_BUILD" = "WNT"; then
+                # Let the Cygwin gcc be found
+                CC=""
+                CXX=""
+            else
+                CC="$CC_FOR_BUILD"
+                CXX="$CXX_FOR_BUILD"
+            fi
             export CC
             export CXX
         fi