summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-14 23:01:58 +0000
committerjvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-14 23:01:58 +0000
commit5b93237d326825c1d2e420f2c52fbef791e13ffb (patch)
tree01c49889b3942a506aab0f8adfbe2509803edb7e
parentfd99334e881859262199c9b8a98f9fbb003b20e1 (diff)
downloadchromium_src-5b93237d326825c1d2e420f2c52fbef791e13ffb.zip
chromium_src-5b93237d326825c1d2e420f2c52fbef791e13ffb.tar.gz
chromium_src-5b93237d326825c1d2e420f2c52fbef791e13ffb.tar.bz2
NaCl SDK: make the ppapi_main getting_started example build with PNaCl.
Tested this with the PNaCl translator, and it seems to work. Perhaps this was disabled before because nacl_io wasn't building with PNaCl? NOTRY=true BUG=none Review URL: https://chromiumcodereview.appspot.com/14655019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200096 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc2
-rw-r--r--native_client_sdk/src/libraries/nacl_io/library.dsc2
2 files changed, 1 insertions, 3 deletions
diff --git a/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc
index 803a1f0..19a2b41 100644
--- a/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc
+++ b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc
@@ -1,5 +1,5 @@
{
- 'TOOLS': ['newlib', 'glibc'],
+ 'TOOLS': ['newlib', 'glibc', 'pnacl'],
'TARGETS': [
{
'NAME': 'hello_world_stdio',
diff --git a/native_client_sdk/src/libraries/nacl_io/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc
index 8f91bbd..2954618 100644
--- a/native_client_sdk/src/libraries/nacl_io/library.dsc
+++ b/native_client_sdk/src/libraries/nacl_io/library.dsc
@@ -1,6 +1,4 @@
{
- # Disabled pnacl for now because it warns on using the language extension
- # typeof(...)
'TOOLS': ['newlib', 'glibc', 'pnacl', 'win'],
'SEARCH': [
'.',