diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-25 22:50:35 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-27 00:55:27 +0300 |
| commit | 463d08d5459a05807e63c833b56614bc8c59643a (patch) | |
| tree | 28183ff6af3991f549f8eb9151a8a2c56e477ebe /cross | |
| parent | eb3cdb6f8d380da19231affd176deb8088481a5a (diff) | |
| download | meson-463d08d5459a05807e63c833b56614bc8c59643a.zip meson-463d08d5459a05807e63c833b56614bc8c59643a.tar.gz meson-463d08d5459a05807e63c833b56614bc8c59643a.tar.bz2 | |
Now host_machine, build_machine and target_machine are properly separated and return correct values.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/ubuntu-armhf.txt | 5 | ||||
| -rw-r--r-- | cross/ubuntu-mingw.txt | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt index 273d293..73e3f67 100644 --- a/cross/ubuntu-armhf.txt +++ b/cross/ubuntu-armhf.txt @@ -1,6 +1,6 @@ [binaries] # we could set exe_wrapper = qemu-arm-static but to test the case -# when cross compiled binaries can't be built we don't do that +# when cross compiled binaries can't be run we don't do that c = '/usr/bin/arm-linux-gnueabihf-gcc' cpp = '/usr/bin/arm-linux-gnueabihf-g++' ar = '/usr/arm-linux-gnueabihf/bin/ar' @@ -21,6 +21,7 @@ alignment_double = 4 # Don't know if this is correct... has_function_printf = true has_function_hfkerhisadf = false -[hostmachine] +[host_machine] name = 'linux' cpu = 'arm' +endian = 'little' diff --git a/cross/ubuntu-mingw.txt b/cross/ubuntu-mingw.txt index 248151f..dd87e5e 100644 --- a/cross/ubuntu-mingw.txt +++ b/cross/ubuntu-mingw.txt @@ -1,5 +1,5 @@ # Something crazy: compiling on Linux a crosscompiler that -# runs on Windows and generates code for iOS. +# runs on Windows and generates code for OSX. [binaries] exe_wrapper = 'wine' # A command used to run generated executables. @@ -11,10 +11,12 @@ strip = '/usr/bin/i686-w64-mingw32-strip' [properties] root = '/usr/i686-w64-mingw32' -[hostmachine] +[host_machine] name = 'windows' cpu = 'x86' +endian = 'little' -[targetmachine] +[target_machine] name='darwin' cpu='arm' +endian = 'little' |