diff options
author | Jakub Jelinek <jakub@redhat.com> | 2020-04-30 11:49:40 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2020-04-30 11:49:40 +0200 |
commit | e33a1eae25b8a8744db2fea72e739d64799ca61f (patch) | |
tree | 4963a812c2302f6d2df67ef05b6a51958e9e3aec /gcc/configure | |
parent | 31e6f8293362979aea53b5cae3fa6ab0b6981694 (diff) |
--with-{documentation,changes}-root-url tweaks
> , CHANGES_URL ("gcc-10/changes.html#empty_base");
>
> where the macro would just use preprocessor string concatenation?
Ok, the following patch implements it (doesn't introduce a separate
macro and just uses CHANGES_ROOT_URL "gcc-10/changes.html#empty_base"),
in addition adds the documentation Joseph requested.
2020-04-30 Jakub Jelinek <jakub@redhat.com>
* configure.ac (--with-documentation-root-url,
--with-changes-root-url): Diagnose URL not ending with /,
use AC_DEFINE_UNQUOTED instead of AC_SUBST.
* opts.h (get_changes_url): Remove.
* opts.c (get_changes_url): Remove.
* Makefile.in (CFLAGS-opts.o): Don't add -DDOCUMENTATION_ROOT_URL
or -DCHANGES_ROOT_URL.
* doc/install.texi (--with-documentation-root-url,
--with-changes-root-url): Document.
* config/arm/arm.c (aapcs_vfp_is_call_or_return_candidate): Don't call
get_changes_url and free, change url variable type to const char * and
set it to CHANGES_ROOT_URL "gcc-10/changes.html#empty_base".
* config/s390/s390.c (s390_function_arg_vector,
s390_function_arg_float): Likewise.
* config/aarch64/aarch64.c (aarch64_vfp_is_call_or_return_candidate):
Likewise.
* config/rs6000/rs6000-call.c (rs6000_discover_homogeneous_aggregate):
Likewise.
* config.in: Regenerate.
* configure: Regenerate.
Diffstat (limited to 'gcc/configure')
-rwxr-xr-x | gcc/configure | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gcc/configure b/gcc/configure index c8fb7a8a7ac..f7030a2356f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -819,8 +819,6 @@ accel_dir_suffix real_target_noncanonical enable_as_accelerator gnat_install_lib -CHANGES_ROOT_URL -DOCUMENTATION_ROOT_URL REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION @@ -7851,8 +7849,8 @@ if test "${with_documentation_root_url+set}" = set; then : withval=$with_documentation_root_url; case "$withval" in yes) as_fn_error $? "documentation root URL not specified" "$LINENO" 5 ;; no) as_fn_error $? "documentation root URL not specified" "$LINENO" 5 ;; - *) DOCUMENTATION_ROOT_URL="$withval" - ;; + */) DOCUMENTATION_ROOT_URL="$withval" ;; + *) as_fn_error $? "documentation root URL does not end with /" "$LINENO" 5 ;; esac else DOCUMENTATION_ROOT_URL="https://gcc.gnu.org/onlinedocs/" @@ -7860,6 +7858,10 @@ else fi +cat >>confdefs.h <<_ACEOF +#define DOCUMENTATION_ROOT_URL "$DOCUMENTATION_ROOT_URL" +_ACEOF + # Allow overriding the default URL for GCC changes @@ -7868,8 +7870,8 @@ if test "${with_changes_root_url+set}" = set; then : withval=$with_changes_root_url; case "$withval" in yes) as_fn_error $? "changes root URL not specified" "$LINENO" 5 ;; no) as_fn_error $? "changes root URL not specified" "$LINENO" 5 ;; - *) CHANGES_ROOT_URL="$withval" - ;; + */) CHANGES_ROOT_URL="$withval" ;; + *) as_fn_error $? "changes root URL does not end with /" "$LINENO" 5 ;; esac else CHANGES_ROOT_URL="https://gcc.gnu.org/" @@ -7877,6 +7879,10 @@ else fi +cat >>confdefs.h <<_ACEOF +#define CHANGES_ROOT_URL "$CHANGES_ROOT_URL" +_ACEOF + # Sanity check enable_languages in case someone does not run the toplevel # configure # script. @@ -19009,7 +19015,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19012 "configure" +#line 19018 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19115,7 +19121,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19118 "configure" +#line 19124 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |