diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 02:49:12 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 02:49:12 +0000 |
| commit | 0e35b4273f005b5222560857a16dcce67b8a7ebd (patch) | |
| tree | 5205ac4de99d2650d5f4c0c66c26a0a20237b5e3 /native_client_sdk | |
| parent | dde0fccafc0860eece7cdf020383fe83352aec25 (diff) | |
| download | chromium_src-0e35b4273f005b5222560857a16dcce67b8a7ebd.zip chromium_src-0e35b4273f005b5222560857a16dcce67b8a7ebd.tar.gz chromium_src-0e35b4273f005b5222560857a16dcce67b8a7ebd.tar.bz2 | |
[NaCl SDK] cleanup generated Makefiles
This change removes some redundancy from the generated
Makefiles.
Also, add -MMD and -Werror to host linux builds.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11369036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
5 files changed, 5 insertions, 8 deletions
diff --git a/native_client_sdk/src/build_tools/library.mk b/native_client_sdk/src/build_tools/library.mk index 5418593..f5fdb33 100644 --- a/native_client_sdk/src/build_tools/library.mk +++ b/native_client_sdk/src/build_tools/library.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -21,9 +21,6 @@ CHROME_PATH?=Undefined # Defaults # NACL_WARNINGS:=-Wno-long-long -Wall -Wswitch-enum -Werror -pedantic -NACL_CCFLAGS:=-O0 -g -pthread $(NACL_WARNINGS) -NACL_CXXFLAGS:= -O0 -g -pthread -std=gnu++98 $(NACL_WARNINGS) -NACL_LDFLAGS:=-Wl,-as-needed -g -pthread -lppapi_cpp -lppapi # diff --git a/native_client_sdk/src/build_tools/make_rules.py b/native_client_sdk/src/build_tools/make_rules.py index b713365..f58f20d 100755 --- a/native_client_sdk/src/build_tools/make_rules.py +++ b/native_client_sdk/src/build_tools/make_rules.py @@ -45,11 +45,12 @@ TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate """ LINUX_DEFAULTS = """ +LINUX_WARNINGS?=-Wno-long-long -Wall -Wswitch-enum -Werror LINUX_CC?=gcc -c LINUX_CXX?=g++ -c LINUX_LINK?=g++ LINUX_LIB?=ar r -LINUX_CCFLAGS=-I$(NACL_SDK_ROOT)/include -I$(NACL_SDK_ROOT)/include/linux +LINUX_CCFLAGS=-MMD -pthread $(LINUX_WARNINGS) -I$(NACL_SDK_ROOT)/include -I$(NACL_SDK_ROOT)/include/linux """ WIN_DEFAULTS = """ diff --git a/native_client_sdk/src/examples/debugging/example.dsc b/native_client_sdk/src/examples/debugging/example.dsc index 654a722..d4b4a75 100644 --- a/native_client_sdk/src/examples/debugging/example.dsc +++ b/native_client_sdk/src/examples/debugging/example.dsc @@ -11,7 +11,7 @@ 'untrusted_crash_dump.c', 'untrusted_crash_dump.h' ], - 'CCFLAGS': ['$(NACL_CCFLAGS)', '-fno-omit-frame-pointer'], + 'CCFLAGS': ['-fno-omit-frame-pointer'], 'LIBS' : ['ppapi', 'pthread'] } ], diff --git a/native_client_sdk/src/examples/dlopen/example.dsc b/native_client_sdk/src/examples/dlopen/example.dsc index 272478b..f1af244 100644 --- a/native_client_sdk/src/examples/dlopen/example.dsc +++ b/native_client_sdk/src/examples/dlopen/example.dsc @@ -11,7 +11,7 @@ 'NAME' : 'libeightball', 'TYPE' : 'so', 'SOURCES' : ['eightball.cc', 'eightball.h'], - 'CXXFLAGS': ['$(NACL_CXXFLAGS)', '-fPIC'], + 'CXXFLAGS': ['-fPIC'], 'LIBS' : ['ppapi_cpp', 'ppapi', 'pthread'] } ], diff --git a/native_client_sdk/src/examples/hello_world_gles/example.dsc b/native_client_sdk/src/examples/hello_world_gles/example.dsc index 67c424e..fb5525a 100644 --- a/native_client_sdk/src/examples/hello_world_gles/example.dsc +++ b/native_client_sdk/src/examples/hello_world_gles/example.dsc @@ -6,7 +6,6 @@ 'TYPE' : 'main', 'SOURCES' : ['hello_world.cc', 'matrix.cc', 'matrix.h'], 'CXXFLAGS': [ - '$(NACL_CXXFLAGS)', '-I../../src', '-I../../src/ppapi/lib/gl' ], |