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

No longer output variables for static libraries when not supported

Browse Source
This commit is contained in:
Pierre Pronchery 2014-11-12 01:47:00 +01:00
parent a415d0adf1
commit b7c76b3696
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/makefile.c
View File

@ -438,6 +438,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
static void _variables_binary(Configure * configure, FILE * fp, char * done); static void _variables_binary(Configure * configure, FILE * fp, char * done);
static void _variables_library(Configure * configure, FILE * fp, char * done); static void _variables_library(Configure * configure, FILE * fp, char * done);
static void _variables_library_static(Configure * configure, FILE * fp);
static void _variables_libtool(Configure * configure, FILE * fp, char * done); static void _variables_libtool(Configure * configure, FILE * fp, char * done);
static void _variables_script(Configure * configure, FILE * fp, char * done); static void _variables_script(Configure * configure, FILE * fp, char * done);
static void _executables_variables(Configure * configure, FILE * fp, static void _executables_variables(Configure * configure, FILE * fp,
@ -732,6 +733,19 @@ static void _variables_library(Configure * configure, FILE * fp, char * done)
_targets_ldflags(configure, fp); _targets_ldflags(configure, fp);
_targets_exeext(configure, fp); _targets_exeext(configure, fp);
} }
if(configure_can_library_static(configure))
_variables_library_static(configure, fp);
if((p = config_get(configure->config, NULL, "ld")) == NULL)
_makefile_output_variable(fp, "CCSHARED",
configure->programs.ccshared);
else
_makefile_output_variable(fp, "CCSHARED", p);
}
static void _variables_library_static(Configure * configure, FILE * fp)
{
String const * p;
if((p = config_get(configure->config, NULL, "ar")) == NULL) if((p = config_get(configure->config, NULL, "ar")) == NULL)
_makefile_output_variable(fp, "AR", configure->programs.ar); _makefile_output_variable(fp, "AR", configure->programs.ar);
else else
@ -741,11 +755,6 @@ static void _variables_library(Configure * configure, FILE * fp, char * done)
configure->programs.ranlib); configure->programs.ranlib);
else else
_makefile_output_variable(fp, "RANLIB", p); _makefile_output_variable(fp, "RANLIB", p);
if((p = config_get(configure->config, NULL, "ld")) == NULL)
_makefile_output_variable(fp, "CCSHARED",
configure->programs.ccshared);
else
_makefile_output_variable(fp, "CCSHARED", p);
} }
static void _variables_libtool(Configure * configure, FILE * fp, char * done) static void _variables_libtool(Configure * configure, FILE * fp, char * done)

2
tests/library/Makefile.Windows
View File

@ -4,8 +4,6 @@ PREFIX = /usr/local
DESTDIR = DESTDIR =
LIBDIR = $(PREFIX)/lib LIBDIR = $(PREFIX)/lib
EXEEXT = .exe EXEEXT = .exe
AR = ar
RANLIB = ranlib
CCSHARED= $(CC) -shared -Wl,-no-undefined -Wl,--enable-runtime-pseudo-reloc CCSHARED= $(CC) -shared -Wl,-no-undefined -Wl,--enable-runtime-pseudo-reloc
RM = rm -f RM = rm -f
LN = ln -f LN = ln -f