diff options
| author | midipix <writeonce@midipix.org> | 2015-03-15 20:46:36 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2015-03-15 20:46:36 -0400 |
| commit | 607827292053aa25d0f0300add0798dd085a9131 (patch) | |
| tree | e73ffbc6e610091dcc7dc9a5f0379f996d98025c /libgfortran | |
| parent | 4cdf4f4f006da014238394af84268dad91f6a79d (diff) | |
| download | cbb-gcc-4.6.4-607827292053aa25d0f0300add0798dd085a9131.tar.bz2 cbb-gcc-4.6.4-607827292053aa25d0f0300add0798dd085a9131.tar.xz | |
compiler building blocks: add support for custom build variables.
feature detection: set a fallback value of 'yes' to modern assembler
presence, PE dward support, libc-provided stack protector, and
dynamic-loader header iteration.
signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information.
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/Makefile.am | 7 | ||||
| -rw-r--r-- | libgfortran/Makefile.in | 8 | ||||
| -rwxr-xr-x | libgfortran/configure | 7 | ||||
| -rw-r--r-- | libgfortran/configure.ac | 7 |
4 files changed, 27 insertions, 2 deletions
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index d1e6d4f94..69b03dcc5 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -1,6 +1,11 @@ ## Process this file with automake to produce Makefile.in +# Compiler Building Blocks variables +cbb_xgcc_for_specs = @cbb_xgcc_for_specs@ +cbb_ldflags_for_target = @cbb_ldflags_for_target@ + + ACLOCAL_AMFLAGS = -I .. -I ../config ## May be used by toolexeclibdir. @@ -31,7 +36,7 @@ version_dep = endif LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ - $(lt_host_flags) + $(lt_host_flags) $(cbb_ldflags_for_target) toolexeclib_LTLIBRARIES = libgfortran.la toolexeclib_DATA = libgfortran.spec diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index dac8bb84c..7cb632706 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -13,6 +13,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + +# Compiler Building Blocks variables +cbb_xgcc_for_specs = @cbb_xgcc_for_specs@ +cbb_ldflags_for_target = @cbb_ldflags_for_target@ + + @SET_MAKE@ @@ -480,7 +486,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = $(srcdir)/gfortran.map @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.map-sun LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ - $(lt_host_flags) + $(lt_host_flags) $(cbb_ldflags_for_target) toolexeclib_LTLIBRARIES = libgfortran.la toolexeclib_DATA = libgfortran.spec diff --git a/libgfortran/configure b/libgfortran/configure index 1e61aeb49..ad0c8aa0c 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -28962,3 +28962,10 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +# Compiler Building Blocks variables +sed -i -e 's#@cbb_xgcc_for_specs@#'"$cbb_xgcc_for_specs"'#g' \ + -e 's#@cbb_ldflags_for_target@#'"$cbb_ldflags_for_target"'#g' \ + -e 's#@cbb_sysroot_for_libgcc@#'"$cbb_sysroot_for_libgcc"'#g' \ + Makefile || exit 2 + diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index 86d716130..2d123c5b3 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -575,3 +575,10 @@ Makefile libgfortran.spec ]) AC_OUTPUT + + +# Compiler Building Blocks variables +sed -i -e 's#@cbb_xgcc_for_specs@#'"$cbb_xgcc_for_specs"'#g' \ + -e 's#@cbb_ldflags_for_target@#'"$cbb_ldflags_for_target"'#g' \ + -e 's#@cbb_sysroot_for_libgcc@#'"$cbb_sysroot_for_libgcc"'#g' \ + Makefile || exit 2 |