[compiler-rt] r219302 - [ASan] Bump the minimum OSX version required to run ASan to 10.7.

[Alexey Samsonov]

On Wed, Oct 8, 2014 at 5:41 AM, Alexander Potapenko <glider at google.com>
wrote:

> Author: glider
> Date: Wed Oct  8 07:41:11 2014
> New Revision: 219302
>
> URL: http://llvm.org/viewvc/llvm-project?rev=219302&view=rev
> Log:
> [ASan] Bump the minimum OSX version required to run ASan to 10.7.
>
>
> Modified:
>     compiler-rt/trunk/CMakeLists.txt
>     compiler-rt/trunk/make/platform/clang_darwin.mk
>
> Modified: compiler-rt/trunk/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=219302&r1=219301&r2=219302&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/CMakeLists.txt (original)
> +++ compiler-rt/trunk/CMakeLists.txt Wed Oct  8 07:41:11 2014
> @@ -299,7 +299,7 @@ if(APPLE)
>    if(COMPILER_RT_USES_LIBCXX)
>      set(SANITIZER_MIN_OSX_VERSION 10.7)
>    else()
> -    set(SANITIZER_MIN_OSX_VERSION 10.6)
> +    set(SANITIZER_MIN_OSX_VERSION 10.7)
>

You can get rid of the if-else now. Note that it's the only place where
COMPILER_RT_USES_LIBCXX is used, so
now you may kill this variable as well.



>    endif()
>    set(CMAKE_OSX_DEPLOYMENT_TARGET "") # We're setting the flag manually
> below.
>    set(DARWIN_osx_CFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION})
>
> Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=219302&r1=219301&r2=219302&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
> +++ compiler-rt/trunk/make/platform/clang_darwin.mk Wed Oct  8 07:41:11
> 2014
> @@ -157,7 +157,7 @@ CFLAGS.eprintf              := $(CFLAGS) $(OSX_DEPLO
>  CFLAGS.10.4            := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
>  # FIXME: We can't build ASAN with our stub SDK yet.
>  CFLAGS.asan_osx_dynamic := \
> -       $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \
> +       $(CFLAGS) -mmacosx-version-min=10.7 -fno-builtin \
>         -gline-tables-only \
>         -DMAC_INTERPOSE_FUNCTIONS=1
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>



-- 
Alexey Samsonov
vonosmas at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141008/34c073e8/attachment.html>