diff options
| author | kan <kan@FreeBSD.org> | 2002-10-10 04:50:29 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2002-10-10 04:50:29 +0000 |
| commit | 029dcab170879d3b9e9bb90bbf64e4b03a919917 (patch) | |
| tree | 1d13663ad373dd43118a9b088472ac82acc3829d /contrib/gcc/Makefile.in | |
| parent | 84c8b4559699bd65591ff9651ef6706bb8c031a4 (diff) | |
| download | FreeBSD-src-029dcab170879d3b9e9bb90bbf64e4b03a919917.zip FreeBSD-src-029dcab170879d3b9e9bb90bbf64e4b03a919917.tar.gz | |
Use the stock 3.2.1-prerelease file.
Approved by: obrien
Diffstat (limited to 'contrib/gcc/Makefile.in')
| -rw-r--r-- | contrib/gcc/Makefile.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/gcc/Makefile.in b/contrib/gcc/Makefile.in index 46c96c5..fb75d52 100644 --- a/contrib/gcc/Makefile.in +++ b/contrib/gcc/Makefile.in @@ -1005,7 +1005,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) xgcc$(exeext SHLIB_MKMAP_OPTS='$(SHLIB_MKMAP_OPTS)' \ SHLIB_MAPFILES='$(SHLIB_MAPFILES)' \ SHLIB_NM_FLAGS='$(SHLIB_NM_FLAGS)' \ - SHLIB_SLIBDIR_SUFFIXES='$(SHLIB_SLIBDIR_SUFFIXES)' \ + MULTILIB_OSDIRNAMES='$(MULTILIB_OSDIRNAMES)' \ mkinstalldirs='$(SHELL) $(srcdir)/mkinstalldirs' \ $(SHELL) mklibgcc > tmp-libgcc.mk mv tmp-libgcc.mk libgcc.mk @@ -1039,7 +1039,8 @@ libgcc.a: $(LIBGCC_DEPS) # switches. multilib.h: s-mlib; @true s-mlib: $(srcdir)/genmultilib Makefile - if test @enable_multilib@ = yes; then \ + if test @enable_multilib@ = yes \ + || test -n "$(MULTILIB_OSDIRNAMES)"; then \ $(SHELL) $(srcdir)/genmultilib \ "$(MULTILIB_OPTIONS)" \ "$(MULTILIB_DIRNAMES)" \ @@ -1047,9 +1048,12 @@ s-mlib: $(srcdir)/genmultilib Makefile "$(MULTILIB_EXCEPTIONS)" \ "$(MULTILIB_EXTRA_OPTS)" \ "$(MULTILIB_EXCLUSIONS)" \ + "$(MULTILIB_OSDIRNAMES)" \ + "@enable_multilib@" \ > tmp-mlib.h; \ else \ - $(SHELL) $(srcdir)/genmultilib '' '' '' '' '' '' > tmp-mlib.h; \ + $(SHELL) $(srcdir)/genmultilib '' '' '' '' '' '' '' no \ + > tmp-mlib.h; \ fi $(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h $(STAMP) s-mlib |
