diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-28 22:54:08 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-28 22:54:08 +0000 |
| commit | a1f2799a8a17c94b4cb06b2512dfcecf549be523 (patch) | |
| tree | 2181d497af8c6a4c2a2d988896c0d7bab5a2bb5f /native_client_sdk/src/tools/common.mk | |
| parent | bba9e63bdb8de860a20f2979c49cb814552d3ee3 (diff) | |
| download | chromium_src-a1f2799a8a17c94b4cb06b2512dfcecf549be523.zip chromium_src-a1f2799a8a17c94b4cb06b2512dfcecf549be523.tar.gz chromium_src-a1f2799a8a17c94b4cb06b2512dfcecf549be523.tar.bz2 | |
[NaCl SDK] Fixup GCC-generated .d files (second attempt)
The change adds a script that will post-procress
gcc-generated .d files such that they do not have
file-not-found issue when headers are removed or
renamed.
Also, fix an issue in common.mk where it was checking
for IGNORE_DEPS incorrectly. This was causing dependencies
to always be built which was leading to duplicate builds
of the same project causing race conditions in the build
system.
R=binji@chromium.org
BUG=None
Review URL: https://codereview.chromium.org/17769006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/tools/common.mk')
| -rw-r--r-- | native_client_sdk/src/tools/common.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk index 058af1b..4a5ab62 100644 --- a/native_client_sdk/src/tools/common.mk +++ b/native_client_sdk/src/tools/common.mk @@ -28,6 +28,7 @@ TOP_MAKE := $(word 1,$(MAKEFILE_LIST)) # Figure out which OS we are running on. # GETOS = python $(NACL_SDK_ROOT)/tools/getos.py +FIXDEPS = python $(NACL_SDK_ROOT)/tools/fix_deps.py OSNAME := $(shell $(GETOS)) @@ -370,7 +371,7 @@ endif # # Assign a sensible default to CHROME_PATH. # -CHROME_PATH ?= $(shell python $(NACL_SDK_ROOT)/tools/getos.py --chrome 2> $(DEV_NULL)) +CHROME_PATH ?= $(shell $(GETOS) --chrome 2> $(DEV_NULL)) # # Verify we can find the Chrome executable if we need to launch it. @@ -423,7 +424,7 @@ run_package: check_for_chrome all $(CHROME_PATH) --load-and-launch-app=$(CURDIR) $(CHROME_ARGS) -SYSARCH = $(shell python $(NACL_SDK_ROOT)/tools/getos.py --nacl-arch) +SYSARCH = $(shell $(GETOS) --nacl-arch) GDB_ARGS += -D $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/$(SYSARCH)-nacl-gdb GDB_ARGS += -D $(abspath $(OUTDIR))/$(TARGET)_$(SYSARCH).nexe |