diff options
| author | binji <binji@chromium.org> | 2016-01-22 17:25:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-23 01:26:01 +0000 |
| commit | c471384b5afde8f3f64e527d77399bfc22c229cf (patch) | |
| tree | 10261212ab33ca38bb2e81c4645f6194d4555a4a /native_client_sdk | |
| parent | 14069e9576fcbe8a0caf255d3dea0031d67f4e30 (diff) | |
| download | chromium_src-c471384b5afde8f3f64e527d77399bfc22c229cf.zip chromium_src-c471384b5afde8f3f64e527d77399bfc22c229cf.tar.gz chromium_src-c471384b5afde8f3f64e527d77399bfc22c229cf.tar.bz2 | |
[NaCl SDK] Fix "make debug" command.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/1599303008
Cr-Commit-Position: refs/heads/master@{#371113}
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/tools/common.mk | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/tools/nacl_gcc.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk index f43ed63..be7e2bb 100644 --- a/native_client_sdk/src/tools/common.mk +++ b/native_client_sdk/src/tools/common.mk @@ -32,6 +32,7 @@ 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)) +SYSARCH := $(shell $(GETOS) --nacl-arch) # @@ -468,7 +469,6 @@ PPAPI_DEBUG = $(abspath $(OSNAME)/Debug/$(TARGET)$(HOST_EXT));application/x-ppap PPAPI_RELEASE = $(abspath $(OSNAME)/Release/$(TARGET)$(HOST_EXT));application/x-ppapi-release -SYSARCH := $(shell $(GETOS) --nacl-arch) SEL_LDR_PATH := python $(NACL_SDK_ROOT)/tools/sel_ldr.py ifndef STANDALONE diff --git a/native_client_sdk/src/tools/nacl_gcc.mk b/native_client_sdk/src/tools/nacl_gcc.mk index 2249734..cf7271d 100644 --- a/native_client_sdk/src/tools/nacl_gcc.mk +++ b/native_client_sdk/src/tools/nacl_gcc.mk @@ -579,6 +579,7 @@ endef # ifeq (x86_32,$(SYSARCH)) LIB_NAME = lib32 +else ifeq (x86_64,$(SYSARCH)) LIB_NAME = lib64 else |