ports/libgit2/build.sh - Issue 730193002: Fix more compile failures caused by recent ARM toolchain upgrade.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ports/libgit2/build.sh

Issue 730193002: Fix more compile failures caused by recent ARM toolchain upgrade. (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ports/libgit2/build.sh

diff --git a/ports/libgit2/build.sh b/ports/libgit2/build.sh

index fa2023223a5c7589a5f368abf195ed0f9e31db8b..1df2eba2f236e05311294b7e04b28325a76fea90 100644

--- a/ports/libgit2/build.sh

+++ b/ports/libgit2/build.sh

@@ -4,15 +4,22 @@

EXECUTABLES="libgit2_clar"

+# Workaround for arm-gcc bug:

+# https://code.google.com/p/nativeclient/issues/detail?id=3205

+# TODO(sbc): remove this once the issue is fixed

+if [ "${NACL_ARCH}" = "arm" ]; then

+ NACLPORTS_CPPFLAGS+=" -mfpu=vfp"

+fi

if [ "${NACL_SHARED}" != "1" ]; then

EXTRA_CMAKE_ARGS="-DBUILD_SHARED_LIBS=OFF"

if [ "${NACL_LIBC}" = "newlib" ]; then

- NACLPORTS_CPPFLAGS="-I${NACLPORTS_INCLUDE}/glibc-compat"

+ NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"

# newlib headers generate a lot of char-subscript warnings

# for macros such as tolower()

- NACLPORTS_CPPFLAGS+=" -Wno-char-subscripts"

+ NACLPORTS_CPPFLAGS+=" -Wno-char-subscripts"S

if [ "$NACL_ARCH" != "arm" ]; then

# Our x86 version of gcc generates a lot of strict aliasing

# warnings.

« no previous file with comments | « ports/cairo/nacl.patch ('k') | ports/libtommath/build.sh » ('j') | no next file with comments »