gbuild: move gb_AsmObject__command to com_GCC_class

This commit is contained in:
Matúš Kukan 2012-04-07 10:30:18 +02:00
parent 6c8c0732bc
commit 2907aa4e47
4 changed files with 18 additions and 65 deletions

View file

@ -135,27 +135,6 @@ define gb_Helper_make_url
file://$(strip $(1))
endef
# AsmObject class
gb_AsmObject_get_source = $(1)/$(2).s
# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
define gb_AsmObject__command
$(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE)) && \
echo "$(1) : $(3)" > $(4)
endef
# LinkTarget class
gb_LinkTarget_CFLAGS := $(gb_CFLAGS)

View file

@ -20,6 +20,24 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
# AsmObject class
gb_AsmObject_get_source = $(1)/$(2).s
# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
define gb_AsmObject__command
$(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE)) && \
echo "$(1) : $(3)" > $(4)
endef
# CObject class

View file

@ -190,28 +190,6 @@ gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
gb_COMPILERNOOPTFLAGS := -O0
# AsmObject class
gb_AsmObject_get_source = $(1)/$(2).s
# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
define gb_AsmObject__command
$(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-c $(3) \
-o $(1) \
-MMD -MT $(1) \
-MP -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE)) && \
echo "$(1) : $(3)" > $(4)
endef
# LinkTarget class
define gb_LinkTarget__get_rpath_for_layer

View file

@ -193,28 +193,6 @@ gb_DEBUG_CXXFLAGS := -fno-default-inline
gb_COMPILERNOOPTFLAGS := -O0
# AsmObject class
gb_AsmObject_get_source = $(1)/$(2).s
# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
define gb_AsmObject__command
$(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
echo "FIXME: Building assembler with gcc not yet implemented." && exit 1
#$(gb_CC) \
# $(DEFS) \
# $(T_CFLAGS) \
# -c $(3) \
# -o $(1) \
# -MMD -MT $(1) \
# -MP -MF $(4) \
# -I$(dir $(3)) \
# $(INCLUDE))
endef
# LinkTarget class
define gb_LinkTarget__get_rpath_for_layer