Skip to content

R
riscv-gcc-1
Commit 6330e1d9 by Ralf Wildenhues Committed by Ralf Wildenhues
Options

v3: fix config.status instantiation of subdir makefiles. 

libstdc++-v3/:
	* configure.ac: Replace AC_CONFIG_COMMANDS([default])
	instantiation with additional commands issued for each Makefile
	in glibcxx_SUBDIRS, so `./config.status subdir/Makefile' also
	runs these commands.
	Add a separate AC_CONFIG_COMMANDS([generate-headers]) for
	running `make' in include, passing `pch_build=' to `make'.
	* configure: Regenerate.

From-SVN: r151352
parent 865dfe39
Showing with 95 additions and 66 deletions
libstdc++-v3/ChangeLog
2009-09-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2009-09-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac: Replace AC_CONFIG_COMMANDS([default])
instantiation with additional commands issued for each Makefile
in glibcxx_SUBDIRS, so `./config.status subdir/Makefile' also
runs these commands.
Add a separate AC_CONFIG_COMMANDS([generate-headers]) for
running `make' in include, passing `pch_build=' to `make'.
* configure: Regenerate.
PR libstdc++/41220 PR libstdc++/41220
* include/Makefile.am (CLEANFILES): Add stamp-host. * include/Makefile.am (CLEANFILES): Add stamp-host.
* include/Makefile.in: Regenerate. * include/Makefile.in: Regenerate.
......
libstdc++-v3/configure
...@@ -59052,12 +59052,23 @@ else ...@@ -59052,12 +59052,23 @@ else
fi fi
ac_config_files="$ac_config_files Makefile include/Makefile libsupc++/Makefile python/Makefile src/Makefile doc/Makefile po/Makefile testsuite/Makefile" ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files scripts/testsuite_flags" ac_config_files="$ac_config_files scripts/testsuite_flags"
ac_config_commands="$ac_config_commands default" # Multilibs need MULTISUBDIR defined correctly in certain makefiles so
# that multilib installs will end up installed in the correct place.
# The testsuite needs it for multilib-aware ABI baseline files.
# To work around this not being passed down from config-ml.in ->
# srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually
# append it here. Only modify Makefiles that have just been created.
#
# Also, get rid of this simulated-VPATH thing that automake does.
ac_config_files="$ac_config_files include/Makefile libsupc++/Makefile python/Makefile src/Makefile doc/Makefile po/Makefile testsuite/Makefile"
ac_config_commands="$ac_config_commands generate-headers"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
...@@ -60196,11 +60207,6 @@ ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" ...@@ -60196,11 +60207,6 @@ ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p" ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p"
# Variables needed in config.status (file generation) which aren't already
# passed by autoconf.
SUBDIRS="$SUBDIRS"
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
...@@ -60214,6 +60220,7 @@ do ...@@ -60214,6 +60220,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"include/gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/gstdint.h" ;; "include/gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/gstdint.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"scripts/testsuite_flags") CONFIG_FILES="$CONFIG_FILES scripts/testsuite_flags" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"libsupc++/Makefile") CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;; "libsupc++/Makefile") CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;;
"python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
...@@ -60221,8 +60228,7 @@ do ...@@ -60221,8 +60228,7 @@ do
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"scripts/testsuite_flags") CONFIG_FILES="$CONFIG_FILES scripts/testsuite_flags" ;; "generate-headers") CONFIG_COMMANDS="$CONFIG_COMMANDS generate-headers" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac
...@@ -61946,32 +61952,63 @@ fi ...@@ -61946,32 +61952,63 @@ fi
;; ;;
"scripts/testsuite_flags":F) chmod +x scripts/testsuite_flags ;; "scripts/testsuite_flags":F) chmod +x scripts/testsuite_flags ;;
"default":C) if test -n "$CONFIG_FILES"; then "include/Makefile":F) cat > vpsed$$ << \_EOF
# Multilibs need MULTISUBDIR defined correctly in certain makefiles so
# that multilib installs will end up installed in the correct place.
# The testsuite needs it for multilib-aware ABI baseline files.
# To work around this not being passed down from config-ml.in ->
# srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually
# append it here. Only modify Makefiles that have just been created.
#
# Also, get rid of this simulated-VPATH thing that automake does.
cat > vpsed << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!! s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF _EOF
for i in $SUBDIRS; do sed -f vpsed$$ $ac_file > tmp$$
case $CONFIG_FILES in grep '^MULTISUBDIR =' Makefile >> tmp$$
*${i}/Makefile*) mv tmp$$ $ac_file
#echo "Adding MULTISUBDIR to $i/Makefile" rm vpsed$$
sed -f vpsed $i/Makefile > tmp ;;
grep '^MULTISUBDIR =' Makefile >> tmp "libsupc++/Makefile":F) cat > vpsed$$ << \_EOF
mv tmp $i/Makefile s!`test -f '$<' || echo '$(srcdir)/'`!!
;; _EOF
esac sed -f vpsed$$ $ac_file > tmp$$
done grep '^MULTISUBDIR =' Makefile >> tmp$$
rm vpsed mv tmp$$ $ac_file
fi rm vpsed$$
(cd include && ${MAKE-make}) ;;
"python/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
;;
"src/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
;;
"doc/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
;;
"po/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
;;
"testsuite/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
;; ;;
"generate-headers":C) (cd include && ${MAKE-make} pch_build= ) ;;
esac esac
done # for ac_tag done # for ac_tag
libstdc++-v3/configure.ac
...@@ -388,45 +388,29 @@ AC_SUBST(LIBSUPCXX_PICFLAGS) ...@@ -388,45 +388,29 @@ AC_SUBST(LIBSUPCXX_PICFLAGS)
dnl In autoconf 2.5x, AC_OUTPUT is replaced by four AC_CONFIG_* macros, dnl In autoconf 2.5x, AC_OUTPUT is replaced by four AC_CONFIG_* macros,
dnl which can all be called multiple times as needed, plus one (different) dnl which can all be called multiple times as needed, plus one (different)
dnl AC_OUTPUT macro. This one lists the files to be created: dnl AC_OUTPUT macro. This one lists the files to be created:
AC_CONFIG_FILES( \ AC_CONFIG_FILES(Makefile)
Makefile \
AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ])
)
AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags]) AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags])
dnl These commands are run at the end of config.status: # Multilibs need MULTISUBDIR defined correctly in certain makefiles so
AC_CONFIG_COMMANDS([default], # that multilib installs will end up installed in the correct place.
[if test -n "$CONFIG_FILES"; then # The testsuite needs it for multilib-aware ABI baseline files.
# Multilibs need MULTISUBDIR defined correctly in certain makefiles so # To work around this not being passed down from config-ml.in ->
# that multilib installs will end up installed in the correct place. # srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually
# The testsuite needs it for multilib-aware ABI baseline files. # append it here. Only modify Makefiles that have just been created.
# To work around this not being passed down from config-ml.in -> #
# srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually # Also, get rid of this simulated-VPATH thing that automake does.
# append it here. Only modify Makefiles that have just been created. AC_CONFIG_FILES(AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ]),
# [cat > vpsed$$ << \_EOF
# Also, get rid of this simulated-VPATH thing that automake does.
cat > vpsed << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!! s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF _EOF
for i in $SUBDIRS; do sed -f vpsed$$ $ac_file > tmp$$
case $CONFIG_FILES in grep '^MULTISUBDIR =' Makefile >> tmp$$
*${i}/Makefile*) mv tmp$$ $ac_file
#echo "Adding MULTISUBDIR to $i/Makefile" rm vpsed$$
sed -f vpsed $i/Makefile > tmp
grep '^MULTISUBDIR =' Makefile >> tmp
mv tmp $i/Makefile
;;
esac
done
rm vpsed
fi
(cd include && ${MAKE-make})
],
[
# Variables needed in config.status (file generation) which aren't already
# passed by autoconf.
SUBDIRS="$SUBDIRS"
]) ])
AC_CONFIG_COMMANDS([generate-headers],
[(cd include && ${MAKE-make} pch_build= )])
dnl And this actually makes things happen: dnl And this actually makes things happen:
AC_OUTPUT AC_OUTPUT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment