Skip to content

Commit 885ec55

Browse files
committed
fix binutils for mac clang
1 parent 086045e commit 885ec55

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cross_compile_ffmpeg.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ if [ -z "$cpu_count" ]; then
12731273
cpu_count=`sysctl -n hw.ncpu | tr -d '\n'` # OS X
12741274
if [ -z "$cpu_count" ]; then
12751275
echo "warning, unable to determine cpu count, defaulting to 1"
1276-
cpu_count=1 # boxes where we don't know how to determine cpu count [OS X for instance], default to just 1, instead of blank, which means infinite
1276+
cpu_count=1 # else default to just 1, instead of blank, which means infinite
12771277
fi
12781278
fi
12791279
original_cpu_count=$cpu_count # save it away for some that revert it temporarily

patches/mingw-w64-build-3.6.4.local

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ gcc_release_ver='4.9.1'
7878
gcc_old_release_ver='4.8.3'
7979
mpfr_release_ver='3.1.2'
8080
mpc_release_ver='1.0.2'
81-
binutils_release_ver='2.24'
81+
binutils_release_ver='2.25'
8282
binutils_snapshot_ver='2.24.51'
8383
gmp_release_ver='6.0.0a'
8484
isl_release_ver='0.12.2'

0 commit comments

Comments
 (0)