aboutsummaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-08-30 22:51:14 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-08-30 22:51:14 +0300
commit52ed7fd8f84b052604b6a8e404d8d990a9d277ed (patch)
tree085a9dd7bb7edeafae1400dcf7e79059b50c5658 /cross
parent702d3e2d9ca55ea330101c925df12e8fc9b40387 (diff)
downloadmeson-52ed7fd8f84b052604b6a8e404d8d990a9d277ed.zip
meson-52ed7fd8f84b052604b6a8e404d8d990a9d277ed.tar.gz
meson-52ed7fd8f84b052604b6a8e404d8d990a9d277ed.tar.bz2
Can build both cross and native binaries at the same time.
Diffstat (limited to 'cross')
-rw-r--r--cross/ubuntu-armhf.txt3
-rw-r--r--cross/ubuntu-mingw.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
index 57c8e2a..b468519 100644
--- a/cross/ubuntu-armhf.txt
+++ b/cross/ubuntu-armhf.txt
@@ -1,6 +1,9 @@
name = 'linux'
c = '/usr/bin/arm-linux-gnueabihf-gcc'
cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ar = '/usr/arm-linux-gnueabihf/bin/ar'
+strip = '/usr/i586-mingw32msvc/bin/strip'
+
root = '/usr/arm-linux-gnueabihf'
pkg_config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
diff --git a/cross/ubuntu-mingw.txt b/cross/ubuntu-mingw.txt
index bb5303f..66b279f 100644
--- a/cross/ubuntu-mingw.txt
+++ b/cross/ubuntu-mingw.txt
@@ -2,4 +2,7 @@ name = 'windows'
exe_wrapper = 'wine' # A command used to run generated executables.
c = '/usr/bin/i586-mingw32msvc-gcc'
cpp = '/usr/bin/i586-mingw32msvc-g++'
+ar = '/usr/i586-mingw32msvc/bin/ar'
+strip = '/usr/i586-mingw32msvc/bin/strip'
+
root = '/usr/i586-mingw32msvc'