summaryrefslogtreecommitdiff
path: root/liblangtag
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-10-14 18:00:23 +0300
committerTor Lillqvist <tml@iki.fi>2012-10-14 18:03:50 +0300
commit979d8f30c6819770935943a3e338cd42de071e02 (patch)
tree5512f53e901a8e4a6112ae2a4544a9729d8ee20f /liblangtag
parent9649d152b28c81e7a0559c8670cc3c96823c0485 (diff)
Enable cross-compilation in general, not just with MinGW
Change-Id: I655c6094e98939d5b087ecb3d2bd6ffef0ea3a05
Diffstat (limited to 'liblangtag')
-rw-r--r--liblangtag/liblangtag-0.2-cross.patch (renamed from liblangtag/liblangtag-0.2-mingw-genfile.patch)0
-rw-r--r--liblangtag/makefile.mk12
2 files changed, 6 insertions, 6 deletions
diff --git a/liblangtag/liblangtag-0.2-mingw-genfile.patch b/liblangtag/liblangtag-0.2-cross.patch
index 66cbc4d25c6e..66cbc4d25c6e 100644
--- a/liblangtag/liblangtag-0.2-mingw-genfile.patch
+++ b/liblangtag/liblangtag-0.2-cross.patch
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 5ba48c70a24e..b13b1734361f 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -118,13 +118,7 @@ CONFIGURE_FLAGS+= LDFLAGS=-Wl,-R\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\'
CONFIGURE_FLAGS+= LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
PATCH_FILES+=liblangtag-0.2-mingw.patch
-# There's a tool used only at build time to create the .xml file, and this does not work
-# with cross-compiling. The file for this case is from a normal (non-cross) build.
-PATCH_FILES+=liblangtag-0.2-mingw-genfile.patch
-.ENDIF
.ELSE # "$(COM)"=="GCC"
@@ -133,6 +127,12 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(GUI)"=="WNT"
+.IF "$(CROSS_COMPILING)"=="YES"
+# There's a tool used only at build time to create the .xml file, and this does not work
+# with cross-compiling. The file for this case is from a normal (non-cross) build.
+PATCH_FILES+=liblangtag-0.2-cross.patch
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
OUT2INC += $(my_install_relative)/include/liblangtag/*