From b9d2db942ce2485e7bb9ce7246f6995eeb956d97 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Tue, 5 Nov 2013 20:34:06 +0200 Subject: [PATCH] Made prebuilt object build on OSX. --- .../prebuilt object/1 basic/meson.build | 21 +++++++++++++++++- test cases/prebuilt object/1 basic/osx.o | Bin 0 -> 2212 bytes 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 test cases/prebuilt object/1 basic/osx.o diff --git a/test cases/prebuilt object/1 basic/meson.build b/test cases/prebuilt object/1 basic/meson.build index 5e4fb7e49..9708d5b36 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 new file mode 100644 index 0000000000000000000000000000000000000000..75c86c6b460d08f4788f82622a283549d0d052ab GIT binary patch literal 2212 zcmb_d%}*0S6rX8JStyhOiV{5R0V5c*TR?~rqph(95=;yML+^ zc;ICG13Z}cCzu!$6FnLeFP@FzWa35AC{f>=ooUk#lS+8W`pCeQpibeUE=x~;9;tgIs^TWv}UT+NWc%F6f^mN)W@7CgtW3z!0OcL@c%#E_DkLT#tlIhmu_kiPx?Y|nt zThk3za&^6j#mnUlmcmit*@d(P6L$ZF*T)NPv|hmTHtbrwr@Vh%9IppI-b$)F57%>8 zRCRtYs^&4!ARZrY&3q4mr+a$20LU*nlPvoU;FW{H(lm3qblI3+d4C1o1mA`A;#(4j z`+<#%5VFjFVoKb%T-L(tTT}0M-oIVG$>#k_03PB3)tyJyLc~lB-X@POjRA0~r~(fi zd_(5>d5=M#0w3xiH-V8bMP!WSIf3VyM#hvOB_1Cn)Xf(h!&Hollhs+*bX;}C)>l_`%T({> zomJP?4O4}SnzvNXbUoRC6J6DI;FZqiJUO3UF%3^0lGD1IHB=I4%32-?1s4mJL71Rn z`W%kIS{RAy=v;_DutY5R0ko5zmbxQBX`05ueK4OuKe-HU1ZEUeXi(ZpNEajHkuzEA`T0v zlw$Qza5K;o-~d?wN$LKNR*)2Pp-0hEQkoWPVvAn^p!brNfau|IuuDl&_P-w>5~~4r zg+F65pg(f`j_cQ4%b)@G4r+*tKJ;~XgX=Y}@%xRo6C&OP%%}qeC%lIp@cSFFrm^NT PshG