fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-05 13:28:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use EXEEXT_FOR_BUILD for makekeys

Browse source 
Use EXEXT_FOR_BUILD, to fix cross-compiling where EXEEXT differs from
EXEEXT_FOR_BUILD, such as when building for Windows from unix.

(Note: As written, this assumes EXEEXT_FOR_BUILD is always empty when
cross-compiling.  There could be some elaborate autodetection for
EXEXT_FOR_BUILD, but for the moment, if you are cross-compiling from
Windows to Unix, you'll need to set EXEEXT_FOR_BUILD explicity...)
This commit is contained in:
Jon Turney 2019-04-24 12:50:41 +01:00 • committed by Alan Coopersmith
parent a121b7b0c2
commit 6886d9ba06
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -65,6 +65,14 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
fi
AC_SUBST(LDFLAGS_FOR_BUILD)
if test x"$EXEEXT_FOR_BUILD" = x; then
if test x"$cross_compiling" = xno; then
EXEEXT_FOR_BUILD=${EXEEXT}
fi
# If cross-compiling and not provided, assume EXEEXT_FOR_BUILD is empty
fi
AC_SUBST([EXEEXT_FOR_BUILD])
# Checks for pkg-config packages
# Always required

4
src/Makefile.am
View file

@ -413,9 +413,9 @@ endif MAKE_LINT_LIB
KEYSYMDEFS=@KEYSYMDEFS@
ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT_FOR_BUILD)
$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
mv ks_tables_h $@
$(top_builddir)/src/util/makekeys$(EXEEXT): $(top_builddir)/src/util/makekeys.c
$(top_builddir)/src/util/makekeys$(EXEEXT_FOR_BUILD): $(top_builddir)/src/util/makekeys.c
cd util && $(MAKE)

1
src/util/Makefile.am
View file

@ -12,6 +12,7 @@ CPPFLAGS = @CPPFLAGS_FOR_BUILD@
CFLAGS = @CFLAGS_FOR_BUILD@
LDFLAGS = @LDFLAGS_FOR_BUILD@
LIBS =
EXEEXT = @EXEEXT_FOR_BUILD@
EXTRA_DIST = mkks.sh