diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -7322,10 +7322,11 @@ fi fi if test "$ac_sys_system" = "Darwin" -a "${LLVM_AR_FOUND}" = "not-found" then - found_llvm_ar=`/usr/bin/xcrun -find llvm-ar 2>/dev/null` + # The Apple-supplied ar in Xcode or the Command Line Tools is apparently sufficient + found_llvm_ar=`/usr/bin/xcrun -find ar 2>/dev/null` if test -n "${found_llvm_ar}" then - LLVM_AR='/usr/bin/xcrun llvm-ar' + LLVM_AR='/usr/bin/xcrun ar' LLVM_AR_FOUND=found { printf "%s\n" "$as_me:${as_lineno-$LINENO}: llvm-ar found via xcrun: ${LLVM_AR}" >&5 printf "%s\n" "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;} @@ -7343,6 +7344,7 @@ printf "%s\n" "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;} Darwin*) # Any changes made here should be reflected in the GCC+Darwin case below LTOFLAGS="-flto -Wl,-export_dynamic" + LTOCFLAGS="-flto" ;; *) LTOFLAGS="-flto" @@ -7353,6 +7355,7 @@ printf "%s\n" "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;} case $ac_sys_system in Darwin*) LTOFLAGS="-flto -Wl,-export_dynamic" + LTOCFLAGS="-flto" ;; *) LTOFLAGS="-flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none" @@ -7368,7 +7371,7 @@ printf "%s\n" "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;} LTOFLAGS="$LTOFLAGS -g" fi - CFLAGS_NODIST="$CFLAGS_NODIST $LTOFLAGS" + CFLAGS_NODIST="$CFLAGS_NODIST ${LTOCFLAGS-$LTOFLAGS}" LDFLAGS_NODIST="$LDFLAGS_NODIST $LTOFLAGS" fi |