diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-11-19 12:40:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-19 12:40:23 +0000 |
| commit | 4b99ad188bdffa00b17f97eec46d67eb9b018502 (patch) | |
| tree | 495fa10bc7cd01978a6db28623797c6c30ddfae6 /build | |
| parent | 54846bbfb2128a1560c8775459c6c656fc9360c8 (diff) | |
| parent | b0476631154e3bfae0ab5a8503e38b527e222da1 (diff) | |
| download | ndk-4b99ad188bdffa00b17f97eec46d67eb9b018502.tar.gz | |
Merge "build/tools/builder-funcs.sh: Fix for Darwin"
Diffstat (limited to 'build')
| -rw-r--r-- | build/tools/builder-funcs.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build/tools/builder-funcs.sh b/build/tools/builder-funcs.sh index fbad6f2c3..340cc6d0f 100644 --- a/build/tools/builder-funcs.sh +++ b/build/tools/builder-funcs.sh @@ -311,7 +311,7 @@ builder_sources () builder_static_library () { - local lib libname + local lib libname arflags libname=$1 if [ -z "$_BUILD_DSTDIR" ]; then panic "Destination directory not set" @@ -327,7 +327,16 @@ builder_static_library () fi builder_log "${_BUILD_PREFIX}Archive: $libname" rm -f "$lib" - builder_command ${_BUILD_AR} crsD "$lib" "$_BUILD_OBJECTS" + arflags="crs" + case $HOST_TAG in + darwin*) + # XCode 'ar' doesn't support D flag + ;; + *) + arflags="${arflags}D" + ;; + esac + builder_command ${_BUILD_AR} $arflags "$lib" "$_BUILD_OBJECTS" fail_panic "Could not archive ${_BUILD_PREFIX}$libname objects!" } |