diff --git a/libstdc++/config/aix.ml b/libstdc++/config/aix.ml index cd968705e705..dec7a905a343 100644 --- a/libstdc++/config/aix.ml +++ b/libstdc++/config/aix.ml @@ -1,8 +1,9 @@ # AIX has wierd shared/non-shared libraries. -ARLIB = libstdc++-ar.a +ARLIB = libstdc++-ar.a.$(VERSION) +ARLINK = libstdc++-ar.a SHLINK = libstdc++.a -LIBS = $(ARLIB) $(SHLIB) $(SHLINK) +LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) DEPLIBS = ../$(SHLIB) SHDEPS = -lm SHFLAGS = -Wl,-unix diff --git a/libstdc++/config/dec-osf.ml b/libstdc++/config/dec-osf.ml index 618c6c89fad8..a11f373d84c1 100644 --- a/libstdc++/config/dec-osf.ml +++ b/libstdc++/config/dec-osf.ml @@ -1,6 +1,6 @@ # We don't need -fpic on the alpha, so let's install both the shared and # non-shared versions. -LIBS = $(ARLIB) $(SHLIB) $(SHLINK) +LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) DEPLIBS = ../$(SHLIB) SHDEPS = -lm diff --git a/libstdc++/config/elfshlibm.ml b/libstdc++/config/elfshlibm.ml index fe2bf3f93bd3..826f0bc0917e 100644 --- a/libstdc++/config/elfshlibm.ml +++ b/libstdc++/config/elfshlibm.ml @@ -1,6 +1,6 @@ # Elf with shared libm, so we can link it into the shared libstdc++. -LIBS = $(ARLIB) $(SHLIB) $(SHLINK) +LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) SHFLAGS = -h $(SHLIB) SHDEPS = -lm DEPLIBS = ../$(SHLIB) diff --git a/libstdc++/config/hpux.ml b/libstdc++/config/hpux.ml index 1531fe867f11..a39602a64032 100644 --- a/libstdc++/config/hpux.ml +++ b/libstdc++/config/hpux.ml @@ -1,6 +1,6 @@ # HPUX uses the .sl suffix for shared libraries. SHLIB = libstdc++.sl -LIBS = $(ARLIB) $(SHLIB) +LIBS = $(ARLIB) $(ARLINK) $(SHLIB) DEPLIBS = ../$(SHLIB) SHFLAGS = $(PICFLAG)