[NaCl SDK] Enable linux host build for nacl_io and nacl_io_tests.

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 207 matching lines @@
 .PHONY: all
 
 
 #
 # The install target is used to install built libraries to thier final destination.
 # By default this is the NaCl SDK 'lib' folder.
 #
 install:
 .PHONY: install
 
+ifdef SEL_LDR
+STANDALONE = 1
+endif
 
 OUTBASE ?= .
-ifdef SEL_LDR
-OUTDIR := $(OUTBASE)/$(TOOLCHAIN)/sel_ldr_$(CONFIG)
+ifdef STANDALONE
+OUTDIR := $(OUTBASE)/$(TOOLCHAIN)/standalone_$(CONFIG)
 else
 OUTDIR := $(OUTBASE)/$(TOOLCHAIN)/$(CONFIG)
 endif
 STAMPDIR ?= $(OUTDIR)
 LIBDIR ?= $(NACL_SDK_ROOT)/lib
 
 
 #
 # Target to remove temporary files
 #
@@ skipping 39 matching lines @@
 $(STAMPDIR)/$(1).stamp: rebuild_$(1)
 
 else
 
 .PHONY: $(STAMPDIR)/$(1).stamp
 $(STAMPDIR)/$(1).stamp:
         @echo Ignore $(1)
 endif
 endef
 
-
 ifeq ($(TOOLCHAIN),win)
+ifdef STANDALONE
+HOST_EXT = .exe
+else
 HOST_EXT = .dll
+endif
+else
+ifdef STANDALONE
+HOST_EXT =
 else
 HOST_EXT = .so
 endif
+endif
 
 
 #
 # Common Compile Options
 #
 # For example, -DNDEBUG is added to release builds by default
 # so that calls to assert(3) are not included in the build.
 #
 ifeq ($(CONFIG),Release)
 POSIX_FLAGS ?= -g -O2 -pthread -MMD -DNDEBUG
 NACL_LDFLAGS ?= -O2
 PNACL_LDFLAGS ?= -O2
 else
 POSIX_FLAGS ?= -g -O0 -pthread -MMD -DNACL_SDK_DEBUG
 endif
 
-ifdef SEL_LDR
+ifdef STANDALONE
 POSIX_FLAGS += -DSEL_LDR=1
 endif
 
 NACL_CFLAGS ?= -Wno-long-long -Werror
 NACL_CXXFLAGS ?= -Wno-long-long -Werror
-NACL_LDFLAGS += -Wl,-as-needed
+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
 
@@ skipping 84 matching lines @@
 
 #
 # File to redirect to to in order to hide output.
 #
 ifeq ($(OSNAME),win)
 DEV_NULL = nul
 else
 DEV_NULL = /dev/null
 endif
 
-#
-# Assign a sensible default to CHROME_PATH.
-#
-CHROME_PATH ?= $(shell $(GETOS) --chrome 2> $(DEV_NULL))
-
-#
-# Verify we can find the Chrome executable if we need to launch it.
-#
-.PHONY: check_for_chrome
-check_for_chrome:
-ifeq (,$(wildcard $(CHROME_PATH)))
-        $(warning No valid Chrome found at CHROME_PATH=$(CHROME_PATH))
-        $(error Set CHROME_PATH via an environment variable, or command-line.)
-else
-        $(warning Using chrome at: $(CHROME_PATH))
-endif
-
 
 #
 # Variables for running examples with Chrome.
 #
 RUN_PY := python $(NACL_SDK_ROOT)/tools/run.py
 HTTPD_PY := python $(NACL_SDK_ROOT)/tools/httpd.py
 
 # Add this to launch Chrome with additional environment variables defined.
 # Each element should be specified as KEY=VALUE, with whitespace separating
 # key-value pairs. e.g.
@@ skipping 13 matching lines @@
 SYSARCH := $(shell $(GETOS) --nacl-arch)
 SEL_LDR_PATH := python $(NACL_SDK_ROOT)/tools/sel_ldr.py
 
 #
 # Common Compile Options
 #
 ifeq ($(CONFIG),Debug)
 SEL_LDR_ARGS += --debug-libs
 endif
 
-ifdef SEL_LDR
-run: all
-ifndef NACL_ARCH
-        $(error Cannot run in sel_ldr unless $$NACL_ARCH is set)
+ifndef STANDALONE
+#
+# Assign a sensible default to CHROME_PATH.
+#
+CHROME_PATH ?= $(shell $(GETOS) --chrome 2> $(DEV_NULL))
+
+#
+# Verify we can find the Chrome executable if we need to launch it.
+#
+.PHONY: check_for_chrome
+check_for_chrome:
+ifeq (,$(wildcard $(CHROME_PATH)))
+        $(warning No valid Chrome found at CHROME_PATH=$(CHROME_PATH))
+        $(error Set CHROME_PATH via an environment variable, or command-line.)
+else
+        $(warning Using chrome at: $(CHROME_PATH))
 endif
-        $(SEL_LDR_PATH) $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(NEXE_ARGS)
-
-debug: all
-ifndef NACL_ARCH
-        $(error Cannot run in sel_ldr unless $$NACL_ARCH is set)
-endif
-        $(SEL_LDR_PATH) -d $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(NEXE_ARGS)
-else
 PAGE ?= index.html
 PAGE_TC_CONFIG ?= "$(PAGE)?tc=$(TOOLCHAIN)&config=$(CONFIG)"
 
 .PHONY: run
 run: check_for_chrome all $(PAGE)
         $(RUN_PY) -C $(CURDIR) -P $(PAGE_TC_CONFIG) \
             $(addprefix -E ,$(CHROME_ENV)) -- $(CHROME_PATH) $(CHROME_ARGS) \
             --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) --load-and-launch-app=$(CURDIR) $(CHROME_ARGS)
 
 GDB_ARGS += -D $(TC_PATH)/$(OSNAME)_x86_newlib/bin/$(SYSARCH)-nacl-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) $(CHROME_ARGS) \
             --enable-nacl-debug \
             --register-pepper-plugins="$(PPAPI_DEBUG),$(PPAPI_RELEASE)"
-endif
 
 .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