DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also implement "asflags_force"

Browse Source
This commit is contained in:
Pierre Pronchery 2015-08-29 17:05:59 +02:00
parent a740869dac
commit 6a8cc5a5a8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/makefile.c
View File

@ -556,13 +556,16 @@ static void _targets_asflags(Configure * configure, FILE * fp)
{ {
String const * as; String const * as;
String const * asf; String const * asf;
String const * asff;
as = config_get(configure->config, NULL, "as"); as = config_get(configure->config, NULL, "as");
asff = config_get(configure->config, NULL, "asflags_force");
asf = config_get(configure->config, NULL, "asflags"); asf = config_get(configure->config, NULL, "asflags");
if(as != NULL || asf != NULL) if(as != NULL || asff != NULL || asf != NULL)
{ {
_makefile_output_variable(fp, "AS", (as != NULL) ? as _makefile_output_variable(fp, "AS", (as != NULL) ? as
: configure->programs.as); : configure->programs.as);
_makefile_output_variable(fp, "ASFLAGSF", asff);
_makefile_output_variable(fp, "ASFLAGS", asf); _makefile_output_variable(fp, "ASFLAGS", asf);
} }
} }
@ -1144,7 +1147,7 @@ static void _flags_asm(Configure * configure, FILE * fp, String const * target)
String const * p; String const * p;
_makefile_print(fp, "%s%s", target, "_ASFLAGS = $(CPPFLAGSF)" _makefile_print(fp, "%s%s", target, "_ASFLAGS = $(CPPFLAGSF)"
" $(CPPFLAGS) $(ASFLAGS)"); " $(CPPFLAGS) $(ASFLAGSF) $(ASFLAGS)");
if((p = config_get(configure->config, target, "asflags")) != NULL) if((p = config_get(configure->config, target, "asflags")) != NULL)
_makefile_print(fp, " %s", p); _makefile_print(fp, " %s", p);
_makefile_print(fp, "%c", '\n'); _makefile_print(fp, "%c", '\n');
@ -1358,7 +1361,8 @@ static int _target_object(Configure * configure, FILE * fp,
case OT_ASM_SOURCE: case OT_ASM_SOURCE:
_makefile_print(fp, "\n%s%s%s%s\n%s%s", target, "_OBJS = ", _makefile_print(fp, "\n%s%s%s%s\n%s%s", target, "_OBJS = ",
"$(OBJDIR)", target, target, "_ASFLAGS =" "$(OBJDIR)", target, target, "_ASFLAGS ="
" $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS)"); " $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGSF)"
" $(ASFLAGS)");
if((p = config_get(configure->config, target, if((p = config_get(configure->config, target,
"asflags")) != NULL) "asflags")) != NULL)
_makefile_print(fp, " %s", p); _makefile_print(fp, " %s", p);