diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-11-05 20:34:06 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-11-05 20:34:06 +0200 |
| commit | b9d2db942ce2485e7bb9ce7246f6995eeb956d97 (patch) | |
| tree | 61255812df24bf7c0ba8361ccda3e2ff0bdf17aa | |
| parent | 8f5d93b4d4a1b2eaca8ed42162506e1a5e326666 (diff) | |
| download | meson-b9d2db942ce2485e7bb9ce7246f6995eeb956d97.zip meson-b9d2db942ce2485e7bb9ce7246f6995eeb956d97.tar.gz meson-b9d2db942ce2485e7bb9ce7246f6995eeb956d97.tar.bz2 | |
Made prebuilt object build on OSX.
| -rw-r--r-- | test cases/prebuilt object/1 basic/meson.build | 21 | ||||
| -rw-r--r-- | test cases/prebuilt object/1 basic/osx.o | bin | 0 -> 2212 bytes |
2 files changed, 20 insertions, 1 deletions
diff --git a/test cases/prebuilt object/1 basic/meson.build b/test cases/prebuilt object/1 basic/meson.build index 5e4fb7e..9708d5b 100644 --- a/test cases/prebuilt object/1 basic/meson.build +++ b/test cases/prebuilt object/1 basic/meson.build @@ -9,7 +9,26 @@ project('prebuilt object', 'c') -object = 'linux-amd64.o' +if host.name() == 'darwin' + object = 'osx.o' +elif host.name() == 'linux' + if meson.get_compiler('c').sizeof('void*') == 8 + object = 'linux-amd64.o' + else + object = 'linux-i386.o' + endif +elif host.name() == 'windows' + id = meson.get_compiler('c').get_id() + if id == 'gcc' + object = 'mingw.obj' + elif id == 'msvc' + object = 'msvc.obj' + else + error('Unknown compiler.') + endif +else + error('Unknown platform.') +endif # Remember: do not put source.c in this # declaration. Only the prebuilt object. diff --git a/test cases/prebuilt object/1 basic/osx.o b/test cases/prebuilt object/1 basic/osx.o Binary files differnew file mode 100644 index 0000000..75c86c6 --- /dev/null +++ b/test cases/prebuilt object/1 basic/osx.o |