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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: native_client_sdk/src/tools/nacl_llvm.mk

Issue 118553007: [NaCl SDK] Use nacl_config.py in common.mk build system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/tools/nacl_gcc.mk ('k') | native_client_sdk/src/tools/tests/getos_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tools/nacl_llvm.mk
diff --git a/native_client_sdk/src/tools/nacl_llvm.mk b/native_client_sdk/src/tools/nacl_llvm.mk
index 2e544a4a0abbee4e1c92bcfacc5706d91166980e..c89a43a920272bbb5347eb8e97dc59a4c7e5b13d 100644
--- a/native_client_sdk/src/tools/nacl_llvm.mk
+++ b/native_client_sdk/src/tools/nacl_llvm.mk
@@ -10,14 +10,13 @@
#
# Paths to Tools
#
-PNACL_BIN = $(TC_PATH)/$(OSNAME)_$(TOOLCHAIN)/bin
-PNACL_CC ?= $(PNACL_BIN)/pnacl-clang -c
-PNACL_CXX ?= $(PNACL_BIN)/pnacl-clang++ -c
-PNACL_LINK ?= $(PNACL_BIN)/pnacl-clang++
-PNACL_LIB ?= $(PNACL_BIN)/pnacl-ar
-PNACL_STRIP ?= $(PNACL_BIN)/pnacl-strip
-PNACL_FINALIZE ?= $(PNACL_BIN)/pnacl-finalize
-PNACL_TRANSLATE ?= $(PNACL_BIN)/pnacl-translate
+PNACL_CC ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=cc)
+PNACL_CXX ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=c++)
+PNACL_LINK ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=c++)
+PNACL_LIB ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=ar)
+PNACL_STRIP ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=strip)
+PNACL_FINALIZE ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=finalize)
+PNACL_TRANSLATE ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --tool=translate)
#
# Compile Macro
« no previous file with comments | « native_client_sdk/src/tools/nacl_gcc.mk ('k') | native_client_sdk/src/tools/tests/getos_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698