Commit 58bf3aa7 authored by John Tapsell's avatar John Tapsell Committed by Daniel Stone

Build: Use native compiler for makekeys

makekeys needs to be run during the build process, as opposed to on the
target, so build it with either of gcc or cc to fix cross-compiling.
This can be overridden by setting $CC_FOR_BUILD.
parent 340422a5
......@@ -22,6 +22,12 @@ XORG_MACROS_VERSION(1.1)
AC_PROG_LIBTOOL
AC_PROG_CC
if test x"$CC_FOR_BUILD" = x && test x"$cross_compiling" = xyes; then
AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
else
CC_FOR_BUILD="$CC"
fi
XORG_PROG_RAWCPP
# Build with XCB support?
......
......@@ -4,8 +4,7 @@ noinst_PROGRAMS=makekeys
makekeys_CFLAGS=$(X11_CFLAGS)
#override CC = gcc
LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CC = @CC_FOR_BUILD@
EXTRA_DIST = mkks.sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment