[NaCl SDK] Use nacl_config.py in common.mk build system.

native_client_sdk/src/tools/common.mk

 # 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.
 
 #
 # GNU Make based build file.  For details on GNU Make see:
 #   http://www.gnu.org/software/make/manual/make.html
 #
 
 #
@@ skipping 10 matching lines @@
 #
 # Top Make file, which we want to trigger a rebuild on if it changes
 #
 TOP_MAKE := $(word 1,$(MAKEFILE_LIST))
 
 
 #
 # Figure out which OS we are running on.
 #
 GETOS := python $(NACL_SDK_ROOT)/tools/getos.py
+NACL_CONFIG := python $(NACL_SDK_ROOT)/tools/nacl_config.py
 FIXDEPS := python $(NACL_SDK_ROOT)/tools/fix_deps.py -c
 OSNAME := $(shell $(GETOS))
 
 
 #
 # TOOLCHAIN=all recursively calls this Makefile for all VALID_TOOLCHAINS.
 #
 ifeq ($(TOOLCHAIN),all)
 
 # Define the default target
@@ skipping 283 matching lines @@
 POSIX_FLAGS += -DSEL_LDR=1
 endif
 
 NACL_CFLAGS ?= -Wno-long-long -Werror
 NACL_CXXFLAGS ?= -Wno-long-long -Werror
 NACL_LDFLAGS += -Wl,-as-needed -pthread
 
 #
 # Default Paths
 #
-ifeq (,$(findstring $(TOOLCHAIN),linux mac win))
-INC_PATHS ?= $(NACL_SDK_ROOT)/include $(NACL_SDK_ROOT)/include/$(TOOLCHAIN) $(EXTRA_INC_PATHS)
-else
-INC_PATHS ?= $(NACL_SDK_ROOT)/include/$(OSNAME) $(NACL_SDK_ROOT)/include $(EXTRA_INC_PATHS)
-endif
-
+INC_PATHS ?= $(shell $(NACL_CONFIG) -t $(TOOLCHAIN) --include-dirs) $(EXTRA_INC_PATHS)
 LIB_PATHS ?= $(NACL_SDK_ROOT)/lib $(EXTRA_LIB_PATHS)
 
 #
 # Define a LOG macro that allow a command to be run in quiet mode where
 # the command echoed is not the same as the actual command executed.
 # The primary use case for this is to avoid echoing the full compiler
 # and linker command in the default case.  Defining V=1 will restore
 # the verbose behavior
 #
 # $1 = The name of the tool being run
@@ skipping 144 matching lines @@
         $(RUN_PY) -C $(CURDIR) -P $(PAGE_TC_CONFIG) \
             $(addprefix -E ,$(CHROME_ENV)) -- $(CHROME_PATH_ESCAPE) \
             $(CHROME_ARGS) --no-sandbox \
             --register-pepper-plugins="$(PPAPI_DEBUG),$(PPAPI_RELEASE)"
 
 .PHONY: run_package
 run_package: check_for_chrome all
         @echo "$(TOOLCHAIN) $(CONFIG)" > $(CURDIR)/run_package_config
         $(CHROME_PATH_ESCAPE) --load-and-launch-app=$(CURDIR) $(CHROME_ARGS)
 
-GDB_ARGS += -D $(TC_PATH)/$(OSNAME)_x86_newlib/bin/x86_64-nacl-gdb
+GDB_ARGS += -D $(shell $(NACL_CONFIG) --tool=gdb)
 GDB_ARGS += -D --eval-command="nacl-manifest $(abspath $(OUTDIR))/$(TARGET).nmf"
 GDB_ARGS += -D $(GDB_DEBUG_TARGET)
 
 .PHONY: debug
 debug: check_for_chrome all $(PAGE)
         $(RUN_PY) $(GDB_ARGS) \
             -C $(CURDIR) -P $(PAGE_TC_CONFIG) \
             $(addprefix -E ,$(CHROME_ENV)) -- $(CHROME_PATH_ESCAPE) \
             $(CHROME_ARGS) --enable-nacl-debug \
             --register-pepper-plugins="$(PPAPI_DEBUG),$(PPAPI_RELEASE)"
 
 .PHONY: serve
 serve: all
         $(HTTPD_PY) -C $(CURDIR)
 endif
 
 # uppercase aliases (for backward compatibility)
 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN
 CHECK_FOR_CHROME: check_for_chrome
 DEBUG: debug
 LAUNCH: run
 RUN: run
 
 endif  # TOOLCHAIN is valid...
 
 endif  # TOOLCHAIN=all