Improve support for pre-processed assembly files

This commit is contained in:
Pierre Pronchery 2018-03-19 18:13:08 +01:00
parent 9664cf16b5
commit eedac9938f

View File

@ -1414,13 +1414,13 @@ static int _target_object(Makefile * makefile,
case OT_ASMPP_SOURCE: case OT_ASMPP_SOURCE:
_makefile_print(makefile, "\n%s%s%s", target, _makefile_print(makefile, "\n%s%s%s", target,
"_OBJS = $(OBJDIR)", target); "_OBJS = $(OBJDIR)", target);
_makefile_print(makefile, "\n%s%s%s", target, _makefile_print(makefile, "\n%s%s", target,
"_ASFLAGS = $(", target, "_CPPFLAGS)"); "_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS)");
if((p = _makefile_get_config(makefile, target, if((p = _makefile_get_config(makefile, target,
"cppflags")) != NULL) "cppflags")) != NULL)
_makefile_print(makefile, " %s", p); _makefile_print(makefile, " %s", p);
_makefile_print(makefile, "%s", " $(ASFLAGSF)" _makefile_print(makefile, "\n%s%s", target,
" $(ASFLAGS)"); "_ASFLAGS = $(ASFLAGSF) $(ASFLAGS)");
if((p = _makefile_get_config(makefile, target, if((p = _makefile_get_config(makefile, target,
"asflags")) != NULL) "asflags")) != NULL)
_makefile_print(makefile, " %s", p); _makefile_print(makefile, " %s", p);
@ -1720,7 +1720,11 @@ static int _target_source(Makefile * makefile,
if(tt == TT_LIBTOOL) if(tt == TT_LIBTOOL)
_makefile_print(makefile, "%s", _makefile_print(makefile, "%s",
"$(LIBTOOL) --mode=compile "); "$(LIBTOOL) --mode=compile ");
_makefile_print(makefile, "%s%s%s", "$(AS) $(", target, _makefile_print(makefile, "%s", "$(AS)");
if(ot == OT_ASMPP_SOURCE)
_makefile_print(makefile, "%s%s%s", " $(",
target, "_CPPFLAGS)");
_makefile_print(makefile, "%s%s%s", " $(", target,
"_ASFLAGS)"); "_ASFLAGS)");
if(tt == TT_OBJECT) if(tt == TT_OBJECT)
_makefile_print(makefile, "%s%s%s%s%s%s", _makefile_print(makefile, "%s%s%s%s%s%s",