diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-21 17:45:40 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-21 17:45:40 +0000 |
| commit | afbf247d1623fce1366fc9ba9afc7739207932db (patch) | |
| tree | 0ef5cc8126fdc40d565f6f355bd52895413f27fd | |
| parent | d68b64ed7ca42b23b6c544e316d6d3c9fdd084ef (diff) | |
| download | chromium_src-afbf247d1623fce1366fc9ba9afc7739207932db.zip chromium_src-afbf247d1623fce1366fc9ba9afc7739207932db.tar.gz chromium_src-afbf247d1623fce1366fc9ba9afc7739207932db.tar.bz2 | |
[NaCl SDK] Build pnacl Release by default.
BUG=none
R=eliben@chromium.org, noelallen@chromium.org, sbc@chromium.org
Review URL: https://codereview.chromium.org/24146007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224605 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_projects.py | 6 | ||||
| -rw-r--r-- | native_client_sdk/src/tools/common.mk | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py index 4758460..264f47d 100755 --- a/native_client_sdk/src/build_tools/build_projects.py +++ b/native_client_sdk/src/build_tools/build_projects.py @@ -235,7 +235,11 @@ def main(argv): pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver) if not options.toolchain: - options.toolchain = ['newlib', 'glibc', 'pnacl', 'host'] + # Order matters here: the default toolchain for an example's Makefile will + # be the first toolchain in this list that is available in the example. + # e.g. If an example supports newlib and glibc, then the default will be + # newlib. + options.toolchain = ['pnacl', 'newlib', 'glibc', 'host'] if 'host' in options.toolchain: options.toolchain.remove('host') diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk index 313d270..dd43eca 100644 --- a/native_client_sdk/src/tools/common.mk +++ b/native_client_sdk/src/tools/common.mk @@ -10,11 +10,11 @@ # # Toolchain # -# By default the VALID_TOOLCHAINS list contains newlib and glibc. If your -# project only builds in one or the other then this should be overridden +# By default the VALID_TOOLCHAINS list contains pnacl, newlib and glibc. If +# your project only builds in one or the other then this should be overridden # accordingly. # -VALID_TOOLCHAINS ?= newlib glibc +VALID_TOOLCHAINS ?= pnacl newlib glibc TOOLCHAIN ?= $(word 1,$(VALID_TOOLCHAINS)) @@ -58,7 +58,7 @@ endef # # The target for all versions # -USABLE_TOOLCHAINS=$(filter $(OSNAME) newlib glibc pnacl,$(VALID_TOOLCHAINS)) +USABLE_TOOLCHAINS=$(filter $(OSNAME) pnacl newlib glibc,$(VALID_TOOLCHAINS)) ifeq ($(NO_HOST_BUILDS),1) USABLE_TOOLCHAINS:=$(filter-out $(OSNAME),$(USABLE_TOOLCHAINS)) @@ -101,9 +101,9 @@ else # TOOLCHAIN is valid... # # The SDK provides two sets of libraries, Debug and Release. Debug libraries # are compiled without optimizations to make debugging easier. By default -# this will build a Debug configuration. +# this will build a Release configuration. # -CONFIG ?= Debug +CONFIG ?= Release # |