From 6465f4e8dd72990f550fd0a63342325fb0d4e026 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Sat, 4 Jun 2011 14:51:55 +0300
Subject: Rehash cross-compilation ideas

Drop the TARGETPLATFORM=BUILD indication of stuff that is to be built
for the build platform but pointless to build for the host platform. I
will handle the split of stuff built for the build or host platforms
differently. Note that some libraries need to be built for both
platforms.

Add explicit rules to do nothing for the cross-compilation case, but
likely even that will be unnecessary in the case of complete modules
like soltools (?). I will just mark modules that are for the build
platform only with an own flag in BUILD_TYPE.
---
 soltools/adjustvisibility/makefile.mk | 1 -
 soltools/cpp/makefile.mk              | 6 +++++-
 soltools/giparser/makefile.mk         | 6 +++++-
 soltools/javadep/makefile.mk          | 6 +++++-
 soltools/mkdepend/makefile.mk         | 6 +++++-
 soltools/support/makefile.mk          | 6 ++++--
 soltools/testhxx/makefile.mk          | 5 +++++
 7 files changed, 29 insertions(+), 7 deletions(-)

(limited to 'soltools')

diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index 65a94c9cdb27..ea0d09c2cf96 100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
 PRJNAME=soltools
 TARGET=adjustvisibility
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 ENABLE_EXCEPTIONS=TRUE
 noadjust=TRUE
 
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index d88161600b0d..5cada33f9cd4 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
 PRJNAME=soltools
 TARGET=cpp
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 NO_DEFAULT_STL=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index 436fadf36241..d7f04dbe82f6 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
 PRJNAME=soltools
 TARGET=soltools_giparser
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -38,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 OBJFILES=\
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index 4e43c5c5c559..e6dcf32350f2 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
 PRJNAME=soltools
 TARGET=javadep
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 NO_DEFAULT_STL=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index 4b73a95ca7ff..fb5fe58d551d 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -29,7 +29,6 @@ PRJNAME=soltools
 TARGET=make_makedepend
 PRJ=..
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 LIBTARGET=NO
 # noadjust here to have dependencies over there
 noadjust=TRUE
@@ -44,6 +43,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 LIBSALCPPRT=
 UWINAPILIB=
 
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index 2db04de12e36..8628b5234d91 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -30,14 +30,16 @@ PRJ=..
 PRJNAME=soltools
 TARGET=soltools_support
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
-
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index 7a1ab97273e3..e71d8f116e23 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -36,6 +36,11 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 SLOFILES = $(SLO)$/testhxx.obj
 
 .INCLUDE: target.mk
-- 
cgit