summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Senkevich <andrew.senkevich@intel.com>2016-12-13 17:40:08 +0300
committerAndrew Senkevich <andrew.senkevich@intel.com>2016-12-13 17:40:08 +0300
commitffb8455c439cda679d4be05b6ebcbaa375334af4 (patch)
tree8db924878d7ae06f6145a72e1ee7058db97876b2
parent5f4f13b47abd5eb984a83302a87b02fb4a94545d (diff)
downloadglibc-ffb8455c439cda679d4be05b6ebcbaa375334af4.tar.gz
Better design of libm.a installation rule.
* math/Makefile ($(inst_libdir)/libm-$(version).a): New target. * ($(inst_libdir)/libm.a): Fix rule to create the target only.
-rw-r--r--ChangeLog5
-rw-r--r--math/Makefile11
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 161af38d7b..facae6f392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-12 Andrew Senkevich <andrew.senkevich@intel.com>
+
+ * math/Makefile ($(inst_libdir)/libm-$(version).a): New target.
+ ($(inst_libdir)/libm.a): Fix rule to create the target only.
+
2016-12-13 Andreas Schwab <schwab@suse.de>
* sysdeps/powerpc/dl-procinfo.c: Don't define
diff --git a/math/Makefile b/math/Makefile
index 49556f69c6..b5d498819c 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -143,15 +143,18 @@ $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
) > $@.new
mv -f $@.new $@
+$(inst_libdir)/libm-$(version).a: $(objpfx)libm.a \
+ $(+force)
+ $(do-install)
+
$(inst_libdir)/libm.a: $(common-objpfx)format.lds \
- $(libm) \
- $(libmvec) \
+ $(inst_libdir)/libm-$(version).a \
+ $(objpfx)../mathvec/libmvec.a \
$(+force)
(echo '/* GNU ld script'; echo '*/';\
cat $<; \
- echo 'GROUP ( $(libdir)/libm-$(lib-version).a $(libdir)/libmvec.a )' \
+ echo 'GROUP ( $(libdir)/libm-$(version).a $(libdir)/libmvec.a )' \
) > $@.new
- cp $(objpfx)libm.a $(inst_libdir)/libm-$(lib-version).a
mv -f $@.new $@
endif