[NaCl SDK] Allow dsc files to omit TOOLS setting

native_client_sdk/src/tools/host_gcc.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
 #
 
 
 #
 # Macros for TOOLS
 #
 # We use the C++ compiler for everything and then use the -Wl,-as-needed flag
 # in the linker to drop libc++ unless it's actually needed.
 #
 CC ?= $(NACL_COMPILER_PREFIX) gcc
 CXX ?= $(NACL_COMPILER_PREFIX) g++
 LINK ?= $(CXX)
-LIB ?= ar
+AR ?= ar
+ARFLAGS = -crs
 STRIP ?= strip
 
+
+ifneq ($(OSNAME),mac)
 # Adding -Wl,-Bsymbolic means that symbols defined within the module are always
-# used by the moulde, and not shadowed by symbols already loaded in, for
+# used by the module, and not shadowed by symbols already loaded in, for
 # exmaple, libc.  Without this the libc symbols (or anything injected with
 # LD_PRELOAD will take precedence).
-HOST_LDFLAGS ?= -Wl,-Map,$(OUTDIR)/$(TARGET).map -Wl,-Bsymbolic
+# -pthread is not needed on mac (libpthread is a symlink to libSystem) and
+# in fact generated a warning if passed at link time.
+HOST_LDFLAGS ?= -Wl,-Map,$(OUTDIR)/$(TARGET).map -Wl,-Bsymbolic -pthread
+else
+HOST_LDFLAGS ?= -Wl,-map -Wl,$(OUTDIR)/$(TARGET).map
+endif
+
 
 ifeq (,$(findstring gcc,$(shell $(WHICH) gcc)))
 $(warning To skip the host build use:)
 $(warning "make all_versions NO_HOST_BUILDS=1")
 $(error Unable to find gcc in PATH while building Host build)
 endif
 
 HOST_WARNINGS ?= -Wno-long-long -Wall -Werror
 HOST_CFLAGS = -fPIC -pthread $(HOST_WARNINGS) -I$(NACL_SDK_ROOT)/include -I$(NACL_SDK_ROOT)/include/linux
 
 
 #
 # Individual Macros
 #
 # $1 = Source Name
 # $2 = Compile Flags
 #
 define C_COMPILER_RULE
 -include $(call SRC_TO_DEP,$(1))
 $(call SRC_TO_OBJ,$(1)): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.stamp
-        $(call LOG,CC  ,$$@,$(CC) -o $$@ -c $$< -fPIC $(POSIX_FLAGS) $(HOST_CFLAGS) $(2))
+        $(call LOG,CC  ,$$@,$(CC) -o $$@ -c $$< -fPIC $(POSIX_CFLAGS) $(HOST_CFLAGS) $(2))
         @$(FIXDEPS) $(call SRC_TO_DEP_PRE_FIXUP,$(1))
 endef
 
 define CXX_COMPILER_RULE
 -include $(call SRC_TO_DEP,$(1))
 $(call SRC_TO_OBJ,$(1)): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.stamp
-        $(call LOG,CXX ,$$@,$(CXX) -o $$@ -c $$< -fPIC $(POSIX_FLAGS) $(HOST_CFLAGS) $(2))
+        $(call LOG,CXX ,$$@,$(CXX) -o $$@ -c $$< -fPIC $(POSIX_CFLAGS) $(HOST_CFLAGS) $(2))
         @$(FIXDEPS) $(call SRC_TO_DEP_PRE_FIXUP,$(1))
 endef
 
 #
 # Compile Macro
 #
 # $1 = Source Name
 # $2 = POSIX Compile Flags
 # $3 = VC Flags (unused)
 #
@@ skipping 26 matching lines @@
 #
 #
 define LIB_RULE
 $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(OSNAME)_host/$(CONFIG)/lib$(1).a
         @echo "TOUCHED $$@" > $(STAMPDIR)/$(1).stamp
 
 all: $(LIBDIR)/$(OSNAME)_host/$(CONFIG)/lib$(1).a
 $(LIBDIR)/$(OSNAME)_host/$(CONFIG)/lib$(1).a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src)))
         $(MKDIR) -p $$(dir $$@)
         $(RM) -f $$@
-        $(call LOG,LIB,$$@,$(LIB) -cr $$@ $$^)
+        $(call LOG,LIB,$$@,$(AR) $(ARFLAGS) $$@ $$^)
 endef
 
 
 #
 # Link Macro
 #
 # $1 = Target Name
 # $2 = List of inputs
 # $3 = List of libs
 # $4 = List of deps
 # $5 = List of lib dirs
 # $6 = Linker Args
 #
 ifdef STANDALONE
 define LINKER_RULE
 all: $(1)
 $(1): $(2) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp)
-        $(call LOG,LINK,$$@,$(LINK) -o $(1) $(2) $(HOST_LDFLAGS) $(NACL_LDFLAGS) $(LDFLAGS) $(foreach path,$(5),-L$(path)/$(OSNAME)_host)/$(CONFIG) $(foreach lib,$(3),-l$(lib)) $(6))
+        $(call LOG,LINK,$$@,$(LINK) -o $(1) $(2) $(HOST_LDFLAGS) $(LDFLAGS) $(foreach path,$(5),-L$(path)/$(OSNAME)_host)/$(CONFIG) $(foreach lib,$(3),-l$(lib)) $(6))
 endef
 else
 define LINKER_RULE
 all: $(1)
 $(1): $(2) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp)
-        $(call LOG,LINK,$$@,$(LINK) -shared -o $(1) $(2) $(HOST_LDFLAGS) $(NACL_LDFLAGS) $(LDFLAGS) $(foreach path,$(5),-L$(path)/$(OSNAME)_host)/$(CONFIG) $(foreach lib,$(3),-l$(lib)) $(6))
+        $(call LOG,LINK,$$@,$(LINK) -shared -o $(1) $(2) $(HOST_LDFLAGS) $(LDFLAGS) $(foreach path,$(5),-L$(path)/$(OSNAME)_host)/$(CONFIG) $(foreach lib,$(3),-l$(lib)) $(6))
 endef
 endif
 
 
 #
 # Link Macro
 #
 # $1 = Target Name
 # $2 = List of Sources
 # $3 = List of LIBS
 # $4 = List of DEPS
 # $5 = POSIX Linker Switches
 # $6 = VC Linker Switches
 #
 define LINK_RULE
 $(call LINKER_RULE,$(OUTDIR)/$(1)$(HOST_EXT),$(foreach src,$(2),$(call SRC_TO_OBJ,$(src))),$(filter-out pthread,$(3)),$(4),$(LIB_PATHS),$(5))
 endef
 
 all: $(LIB_LIST) $(DEPS_LIST)
 
 
 #
 # Strip Macro
-# The host build makes shared libraries, so the best we can do is strip-debug.
-# We cannot strip the symbol names.
+# The host build makes shared libraries, so the best we can do is -S, which
+# only strip debug symbols.  We don't strip the symbol names.
 #
 # $1 = Target Name
 # $2 = Input Name
 #
 define STRIP_RULE
 all: $(OUTDIR)/$(1)$(HOST_EXT)
 $(OUTDIR)/$(1)$(HOST_EXT): $(OUTDIR)/$(2)$(HOST_EXT)
-        $(call LOG,STRIP,$$@,$(STRIP) --strip-debug -o $$@ $$^)
+        $(call LOG,STRIP,$$@,$(STRIP) -S -o $$@ $$^)
 endef
 
 
 #
 # Run standalone builds (command line builds outside of chrome)
 #
 ifdef STANDALONE
 run: all
         $(RUN_UNDER) $(OUTDIR)/$(TARGET)$(HOST_EXT) $(EXE_ARGS)
 endif