| Index: native_client_sdk/src/tools/host_gcc.mk
|
| diff --git a/native_client_sdk/src/tools/host_gcc.mk b/native_client_sdk/src/tools/host_gcc.mk
|
| index b732431b0b0f693af5fc92a36fc9ef6cc79bf379..ddbcf2ed87666d55ebce6fec4b590b3bd0275c7f 100644
|
| --- a/native_client_sdk/src/tools/host_gcc.mk
|
| +++ b/native_client_sdk/src/tools/host_gcc.mk
|
| @@ -40,14 +40,14 @@ LINUX_CFLAGS = -fPIC -pthread $(LINUX_WARNINGS) -I$(NACL_SDK_ROOT)/include -I$(N
|
| 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 ,$$@,$(HOST_CC) -o $$@ -c $$< -fPIC $(POSIX_FLAGS) $(2) $(LINUX_CFLAGS))
|
| + $(call LOG,CC ,$$@,$(HOST_CC) -o $$@ -c $$< -fPIC $(POSIX_FLAGS) $(LINUX_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 ,$$@,$(HOST_CXX) -o $$@ -c $$< -fPIC $(POSIX_FLAGS) $(2) $(LINUX_CFLAGS))
|
| + $(call LOG,CXX ,$$@,$(HOST_CXX) -o $$@ -c $$< -fPIC $(POSIX_FLAGS) $(LINUX_CFLAGS) $(2))
|
| @$(FIXDEPS) $(call SRC_TO_DEP_PRE_FIXUP,$(1))
|
| endef
|
|
|
| @@ -108,11 +108,19 @@ endef
|
| # $5 = List of lib dirs
|
| # $6 = Other Linker Args
|
| #
|
| +ifdef SEL_LDR
|
| +define LINKER_RULE
|
| +all: $(1)
|
| +$(1): $(2) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp)
|
| + $(call LOG,LINK,$$@,$(HOST_LINK) -o $(1) $(2) $(NACL_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,$$@,$(HOST_LINK) -shared -o $(1) $(2) $(NACL_LDFLAGS) $(foreach path,$(5),-L$(path)/$(OSNAME)_host)/$(CONFIG) $(foreach lib,$(3),-l$(lib)) $(6))
|
| endef
|
| +endif
|
|
|
|
|
| #
|
|
|