From 3dce4e892cbca7a91993df71cf1610f41aab6943 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 25 Sep 2009 10:10:18 +0000 Subject: introduce CANONTARGETGNU, to be able to use -gnueabi for ARM (from Arnaud Patard) --- Makefile.am | 1 + configure.ac | 2 ++ macros.in | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 18888e9..0116577 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,6 +88,7 @@ edit = sed \ -e 's,@RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\ -e 's,@RPMOS\@,$(RPMOS),g' \ -e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \ + -e 's,@CANONTARGETGNU\@,$(CANONTARGETGNU),g' \ -e 's,@RPMALLARCH\@,$(RPMALLARCH),g' %: %.in Makefile diff --git a/configure.ac b/configure.ac index a92f018..1573b39 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS([string.h rpm/rpmmacro.h rpm/rpmlib.h rpm/rpmio.h rpm/rpmtag.h]) CANONTARGETCPU=${target_cpu} +CANONTARGETGNU=-gnu case "${target_cpu}" in *86|athlon|k6|pentium*) @@ -73,6 +74,7 @@ RPMALLARCH="${RPMALLARCH} noarch" AC_SUBST(RPMALLARCH) AC_SUBST(CANONTARGETCPU) AC_SUBST(CANONTARGETCPU32) +AC_SUBST(CANONTARGETGNU) # # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os diff --git a/macros.in b/macros.in index 5818536..2b0e72e 100644 --- a/macros.in +++ b/macros.in @@ -14,7 +14,7 @@ %_vendor @RPMVENDOR@ -%_gnu -gnu +%_gnu @CANONTARGETGNU@ %_target_platform %{_target_cpu}-%{_real_vendor}-%{_target_os}%{?_gnu} %_host %{_host_cpu}-%{_real_vendor}-%{_host_os} -- cgit v1.2.1