ports/jsoncpp/build.sh - Issue 1804293003: Add support for new pnacl native toolchain driver

Side by Side Diff

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

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

Side by Side Diff: ports/jsoncpp/build.sh

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master

Patch Set: Fix according to Brad's comments Created 4 years, 7 months ago

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

Jump to:

OLD	NEW
1 # Copyright (c) 2012 The Native Client Authors. All rights reserved.	1 # Copyright (c) 2012 The Native Client Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 # The NaCL SDK includes a version of jsoncpp conflicts with this one.	5 # The NaCL SDK includes a version of jsoncpp conflicts with this one.

6 # Remove the SDK include path so that these headers don't get used	6 # Remove the SDK include path so that these headers don't get used

7 # during the build.	7 # during the build.

	8 NACLPORTS_CPPFLAGS+=" ${NACL_EXCEPTIONS_FLAG}"

8 NACLPORTS_CPPFLAGS=${NACLPORTS_CPPFLAGS/-I${NACL_SDK_ROOT}\/include/}	9 NACLPORTS_CPPFLAGS=${NACLPORTS_CPPFLAGS/-I${NACL_SDK_ROOT}\/include/}

9	10

10 EXECUTABLES=src/test_lib_json/jsoncpp_test	11 EXECUTABLES=src/test_lib_json/jsoncpp_test

11	12

12 EXTRA_CMAKE_ARGS="-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF"	13 EXTRA_CMAKE_ARGS="-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF"

13	14

14 TestStep() {	15 TestStep() {

15 if [ "${TOOLCHAIN}" = "pnacl" ]; then	16 if [ "${TOOLCHAIN}" = "pnacl" ]; then

16 return	17 return

17 fi	18 fi

18 LogExecute src/test_lib_json/jsoncpp_test.sh	19 LogExecute src/test_lib_json/jsoncpp_test.sh

19 }	20 }

OLD	NEW