[Tarantool-patches] [PATCH luajit 1/3] build: pass sysroot to MacOS SDK
Igor Munkin
imun at tarantool.org
Wed May 19 16:23:13 MSK 2021
Sergos,
Thanks for your review!
On 19.05.21, Sergey Ostanevich wrote:
> Hi!
>
> I believe we move from patch to two files originally
> +++ b/CMakeLists.txt
> +++ b/cmake/LuaJITUtils.cmake
>
> to just one, in 432cdf62303b0d609525acc84b01b92ae468d327
> +++ b/cmake/LuaJITUtils.cmake
>
> I expect to see a ‘v2’ in such a case - for the forthcoming patches.
Ouch, my bad. There were so many iterative patches that even if all
changes are in the same files, it's worth to send v2 series.
>
> Anyways, if I read the correct patch above from the imun/gh-5983-fix-build-on-m1
> branch then it’s LGTM with just a typo fix.
Added your tag:
| Reviewed-by: Sergey Ostanevich <sergos at tarantool.org>
>
> Sergos
>
>
> > On 19 May 2021, at 14:38, Igor Munkin <imun at tarantool.org> wrote:
> >
> > As a result of offline discussion with Sergey, I've finally understood
> > the docs and fixed the issue. Diff is below:
> >
> > ================================================================================
> >
> > diff --git a/cmake/LuaJITUtils.cmake b/cmake/LuaJITUtils.cmake
> > index 3497edc4..29c425de 100644
> > --- a/cmake/LuaJITUtils.cmake
> > +++ b/cmake/LuaJITUtils.cmake
> > @@ -4,7 +4,12 @@ function(LuaJITTestArch outvar strflags)
> > # machinery) or explicitly (manually by configuration options).
> > # Need -isysroot flag on recentish MacOS after command line
> > # tools no longer provide headers in /usr/include.
> > - if(CMAKE_OSX_SYSROOT)
> > + # XXX: According to CMake documentation[1], CMAKE_OSX_SYSROOT
> > + # variable *should* be ignored on the plaforms other than MacOS.
> platforms
Fixed, thanks!
> > + # It is ignored by CMake, but since this routine is extension
> > + # it also should follow this policy.
> > + # [1]: https://cmake.org/cmake/help/v3.1/variable/CMAKE_OSX_SYSROOT.html <https://cmake.org/cmake/help/v3.1/variable/CMAKE_OSX_SYSROOT.html>
> > + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
> > set(strflags "${strflags} -isysroot ${CMAKE_OSX_SYSROOT}")
> > endif()
> > # XXX: <execute_process> simply splits the COMMAND argument by
> >
> > ================================================================================
> >
<snipped>
> >
> > --
> > Best regards,
> > IM
>
--
Best regards,
IM
More information about the Tarantool-patches
mailing list