Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Side by Side Diff: native_client_sdk/src/tools/common.mk

Issue 412083002: [NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « native_client_sdk/src/tests/sdk_util_test/main.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium 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 # 5 #
6 # GNU Make based build file. For details on GNU Make see: 6 # GNU Make based build file. For details on GNU Make see:
7 # http://www.gnu.org/software/make/manual/make.html 7 # http://www.gnu.org/software/make/manual/make.html
8 # 8 #
9 9
10 # 10 #
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 # so that calls to assert(3) are not included in the build. 319 # so that calls to assert(3) are not included in the build.
320 # 320 #
321 ifeq ($(CONFIG),Release) 321 ifeq ($(CONFIG),Release)
322 POSIX_FLAGS ?= -g -O2 -pthread -MMD -DNDEBUG 322 POSIX_FLAGS ?= -g -O2 -pthread -MMD -DNDEBUG
323 NACL_LDFLAGS ?= -O2 323 NACL_LDFLAGS ?= -O2
324 PNACL_LDFLAGS ?= -O2 324 PNACL_LDFLAGS ?= -O2
325 else 325 else
326 POSIX_FLAGS ?= -g -O0 -pthread -MMD -DNACL_SDK_DEBUG 326 POSIX_FLAGS ?= -g -O0 -pthread -MMD -DNACL_SDK_DEBUG
327 endif 327 endif
328 328
329 ifdef STANDALONE
330 POSIX_FLAGS += -DSEL_LDR=1
331 endif
332
333 NACL_CFLAGS ?= -Wno-long-long -Werror 329 NACL_CFLAGS ?= -Wno-long-long -Werror
334 NACL_CXXFLAGS ?= -Wno-long-long -Werror 330 NACL_CXXFLAGS ?= -Wno-long-long -Werror
335 NACL_LDFLAGS += -Wl,-as-needed -pthread 331 NACL_LDFLAGS += -Wl,-as-needed -pthread
336 332
337 # 333 #
338 # Default Paths 334 # Default Paths
339 # 335 #
340 INC_PATHS := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --include-dirs) $(EXTRA_INC_ PATHS) 336 INC_PATHS := $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --include-dirs) $(EXTRA_INC_ PATHS)
341 LIB_PATHS := $(NACL_SDK_ROOT)/lib $(EXTRA_LIB_PATHS) 337 LIB_PATHS := $(NACL_SDK_ROOT)/lib $(EXTRA_LIB_PATHS)
342 338
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 # uppercase aliases (for backward compatibility) 529 # uppercase aliases (for backward compatibility)
534 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN 530 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN
535 CHECK_FOR_CHROME: check_for_chrome 531 CHECK_FOR_CHROME: check_for_chrome
536 DEBUG: debug 532 DEBUG: debug
537 LAUNCH: run 533 LAUNCH: run
538 RUN: run 534 RUN: run
539 535
540 endif # TOOLCHAIN is valid... 536 endif # TOOLCHAIN is valid...
541 537
542 endif # TOOLCHAIN=all 538 endif # TOOLCHAIN=all
OLDNEW
« no previous file with comments | « native_client_sdk/src/tests/sdk_util_test/main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698