diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2018-02-23 23:24:40 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2019-11-15 22:33:53 +0000 |
| commit | 7e4c052fb29c6838b483d2c0adf9da45b3f01ee1 (patch) | |
| tree | fe40380c06cd78667a0bb6b916ba0c0867aa35d9 /Makefile.am | |
| parent | 60a13651c495a9b1c593ad4692a2ac9f039b4696 (diff) | |
| download | strace-7e4c052fb29c6838b483d2c0adf9da45b3f01ee1.tar.gz | |
Add support for per-mpers compiler settings
As some very special architectures require a separate compiler
in order to compile binaries for additional supported personalities,
we have to introduce such support.
* Makefile.am (mpers_CPPFLAGS): Move $(strace_CPPFLAGS) ...
(mpers_sh_opts): ... here.
(mpers-m%.stamp:): Use $(mpers_CC) instead of $(CC) for compiler,
pass $(mpers_CC_FLAGS) in quotes as it might be empty or contain spaces.
($(mpers_m32_targets)): Add @CFLAGS_FOR_M32@ to mpers_CC_FLAGS, set
mpers_CPPFLAGS and mpers_CC.
($(mpers_mx32_targets)): Add @CFLAGS_FOR_MX32@ to mpers_CC_FLAGS, set
mpers_CPPFLAGS and mpers_CC.
* bootstrap (m_upper): Derive uppercase personality name.
Set CC for mpers Makefile.am, add @CFLAGS_FOR_{M32,MX32}@ to
MPERS_CC_FLAGS definition.
* configure.ac: Derive default values for
{CC,CPP,CFLAGS,CPPFLAGS}_FOR_{M32,MX32} from the respective CC, CPP,
CFLAGS, and CPPFLAGS values.
* m4/mpers.m4 (AC_DEFUN([st_MPERS])): Use
{CC,CPP,CFLAGS,CPPFLAGS}_FOR_<$1> as CC, CPP, CFLAGS, and CPPFLAGS,
respectively. Enclose MPERS_CFLAGS in quotes in mpers.sh call. Provide
information about compiler in the AC_CACHE_CHECK message.
* tests/Makefile.am (CC): New variable.
Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 7444a8d6c..e61edb260 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1082,8 +1082,8 @@ mpers_NAME = mpers_PREFIX = $(mpers_NAME)_ mpers_DEFS = $(DEFS) mpers_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES) -mpers_CPPFLAGS = $(strace_CPPFLAGS) $(CPPFLAGS) -mpers_sh_opts = $(mpers_DEFS) $(mpers_INCLUDES) $(mpers_CPPFLAGS) +mpers_CPPFLAGS = $(CPPFLAGS) +mpers_sh_opts = $(mpers_DEFS) $(mpers_INCLUDES) $(strace_CPPFLAGS) $(mpers_CPPFLAGS) libmpers_CPPFLAGS = $(strace_CPPFLAGS) -DIN_MPERS libmpers_CFLAGS = $(strace_CFLAGS) @@ -1093,11 +1093,11 @@ mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h for f in $^; do \ D="$(D)" \ READELF="$(READELF)" \ - CC="$(CC)" \ + CC="$(mpers_CC)" \ CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \ CPP="$(CPP)" \ CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \ - $(srcdir)/mpers.sh $(mpers_NAME) $(mpers_CC_FLAGS) $$f || exit; \ + $(srcdir)/mpers.sh $(mpers_NAME) "$(mpers_CC_FLAGS)" $$f || exit; \ done > $@ @@ -1168,7 +1168,9 @@ BUILT_SOURCES += $(mpers_m32_targets) CLEANFILES += $(mpers_m32_targets) $(mpers_m32_targets): mpers_NAME = m32 -$(mpers_m32_targets): mpers_CC_FLAGS = @cc_flags_m32@ +$(mpers_m32_targets): mpers_CC_FLAGS = @CFLAGS_FOR_M32@ @cc_flags_m32@ +$(mpers_m32_targets): mpers_CPPFLAGS = @CPPFLAGS_FOR_M32@ +$(mpers_m32_targets): mpers_CC = @CC_FOR_M32@ endif # HAVE_M32_MPERS @@ -1185,7 +1187,9 @@ BUILT_SOURCES += $(mpers_mx32_targets) CLEANFILES += $(mpers_mx32_targets) $(mpers_mx32_targets): mpers_NAME = mx32 -$(mpers_mx32_targets): mpers_CC_FLAGS = @cc_flags_mx32@ +$(mpers_mx32_targets): mpers_CC_FLAGS = @CFLAGS_FOR_MX32@ @cc_flags_mx32@ +$(mpers_mx32_targets): mpers_CPPFLAGS = @CPPFLAGS_FOR_MX32@ +$(mpers_mx32_targets): mpers_CC = @CC_FOR_MX32@ endif # HAVE_MX32_MPERS |