Commit e79c8385 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Don't do gcc version checks if we're building with clang 



We have several checks for bad gcc versions in our Makefile. These don't
apply if we're building with clang, so skip them in that case.

The obvious check would be for ${COMPILER} = "gcc", but because of the
way the logic in the top level Makefile conditionally sets COMPILER,
it's possible that we're building with gcc but COMPILER was not set.

So instead check for ${COMPILER} != "clang", which we know is currently
the only other possibility.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5c0aebf6

arch/powerpc/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ TOUT := .tmp_gas_check 
# - Require gcc 4.0 or above on 64-bit

# - gcc-4.2.0 has issues compiling modules on 64-bit

checkbin:

	@if test "$(cc-version)" = "0304" ; then \

	@if test "${COMPILER}" != "clang" \

	    && test "$(cc-version)" = "0304" ; then \

		if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \

			echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \

			echo 'correctly with gcc-3.4 and your version of binutils.'; \
@@ -322,13 +323,15 @@ checkbin: 
			false; \

		fi ; \

	fi

	@if test "$(cc-version)" -lt "0400" \

	@if test "${COMPILER}" != "clang" \

	    && test "$(cc-version)" -lt "0400" \

	    && test "x${CONFIG_PPC64}" = "xy" ; then \

                echo -n "Sorry, GCC v4.0 or above is required to build " ; \

                echo "the 64-bit powerpc kernel." ; \

                false ; \

        fi

	@if test "$(cc-fullversion)" = "040200" \

	@if test "${COMPILER}" != "clang" \

	    && test "$(cc-fullversion)" = "040200" \

	    && test "x${CONFIG_MODULES}${CONFIG_PPC64}" = "xyy" ; then \

		echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \

		echo 'kernel with modules enabled.' ; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE