From db7638c97c25db4827199b726958597701e04c2e Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 16 Sep 2011 10:57:54 +0000 Subject: [PATCH] More portable definition of AR --- src/makefile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/makefile.c b/src/makefile.c index 7477257..98198c8 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -619,7 +619,7 @@ static void _variables_library(Configure * configure, FILE * fp, char * done) _targets_ldflags(configure, fp); } if((p = config_get(configure->config, "", "ar")) == NULL) - p = "ar -rc"; + p = "ar"; _makefile_output_variable(fp, "AR", p); if((p = config_get(configure->config, "", "ranlib")) == NULL) p = "ranlib"; @@ -1018,7 +1018,7 @@ static int _target_library(Configure * configure, FILE * fp, if((p = config_get(configure->config, target, "depends")) != NULL) fprintf(fp, " %s", p); fputc('\n', fp); - fprintf(fp, "%s%s%s%s%s", "\t$(AR) ", target, ".a $(", target, + fprintf(fp, "%s%s%s%s%s", "\t$(AR) -rc ", target, ".a $(", target, "_OBJS)"); if((q = malloc(strlen(target) + 4)) != NULL) /* for ".so" later */ { @@ -1147,8 +1147,8 @@ static int _target_plugin(Configure * configure, FILE * fp, if((p = config_get(configure->config, target, "depends")) != NULL) fprintf(fp, " %s", p); fputc('\n', fp); - fprintf(fp, "%s%s%s%s%s%s%s", "\t$(LD) -o ", target, ".so $(", target, - "_OBJS) $(", target, "_LDFLAGS)"); + fprintf(fp, "%s%s%s%s%s%s%s", "\t$(LD) -o ", target, ".so $(", + target, "_OBJS) $(", target, "_LDFLAGS)"); if((q = malloc(strlen(target) + 4)) != NULL) { sprintf(q, "%s.so", target);