- leave osfmach3_ppc alone

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 7de1cd2ccb407ceb2f968f166014f210baad5be1..8c96b7b6dcfdd4ce09f5c5bb81c5726000a89c27 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -8,6 +8,8 @@
 %kgcc          %{__cc}
 %kgcc_package  gcc
 
+%__rm                  /bin/rm --interactive=never
+
 # Build system path macros.
 #
 %__autoconf            autoconf %{?debug:-Wall}
@@ -1222,14 +1224,14 @@ done \
 %define Opts                                                                                                           \\\\\\\
 %if "%{_target_base_arch}" != "%{_arch}"                                                       \\\
        %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"  \\\
-       CC="%{__cc}" CPP="%{__cpp}" ARCH=%{_target_base_arch}                   \\\
+       CC="%{kgcc}" ARCH=%{_target_base_arch}                                                  \\\
        %else                                                                                                                   \\\
        ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
        %endif                                                                                                                  \\\
 %else                                                                                                                          \\\
-       CC="%{__cc}" CPP="%{__cpp}"                                                                             \\\
+       CC="%{kgcc}"                                                                                                    \\\
 %endif                                                                                                                         \
-%define        MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
+%define        MakeOpts HOSTCC="%{kgcc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
                O=$PWD/o %{?with_verbose:V=1} %{Opts}                                           \
                                                                                                                                        \
 %{?-C:cd %{-C*}}                                                                                                       \