configure: When cross-compiling, propagate the target specification to winebuild.
This commit is contained in:
parent
53626dbd93
commit
424cb27e6a
|
@ -43,6 +43,7 @@ STRIP = @STRIP@
|
||||||
WINDRES = @WINDRES@
|
WINDRES = @WINDRES@
|
||||||
LN = @LN@
|
LN = @LN@
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
|
TARGET = @TARGET@
|
||||||
TOOLSDIR = @TOOLSDIR@
|
TOOLSDIR = @TOOLSDIR@
|
||||||
AS = @AS@
|
AS = @AS@
|
||||||
LD = @LD@
|
LD = @LD@
|
||||||
|
@ -61,7 +62,7 @@ EXTRACFLAGS = @EXTRACFLAGS@
|
||||||
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
|
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
|
||||||
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
|
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
|
||||||
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
|
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
|
||||||
WINEBUILDFLAGS = $(DLLFLAGS) --as-cmd "$(AS)"
|
WINEBUILDFLAGS = $(DLLFLAGS) $(TARGET:%=--target %) --as-cmd "$(AS)"
|
||||||
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
|
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
|
||||||
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
|
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
|
||||||
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
|
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
|
||||||
|
|
|
@ -745,6 +745,7 @@ X_PRE_LIBS
|
||||||
X_CFLAGS
|
X_CFLAGS
|
||||||
CPP
|
CPP
|
||||||
XMKMF
|
XMKMF
|
||||||
|
TARGET
|
||||||
TOOLSDIR
|
TOOLSDIR
|
||||||
CPPBIN
|
CPPBIN
|
||||||
ac_ct_CXX
|
ac_ct_CXX
|
||||||
|
@ -3873,6 +3874,11 @@ fi
|
||||||
$as_echo "$wine_cv_toolsdir" >&6; }
|
$as_echo "$wine_cv_toolsdir" >&6; }
|
||||||
TOOLSDIR=$wine_cv_toolsdir
|
TOOLSDIR=$wine_cv_toolsdir
|
||||||
|
|
||||||
|
if test "$cross_compiling" = "yes"
|
||||||
|
then
|
||||||
|
TARGET="$host_alias"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
|
|
|
@ -159,6 +159,10 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
|
||||||
AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.])
|
AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.])
|
||||||
fi])
|
fi])
|
||||||
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
|
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
|
||||||
|
if test "$cross_compiling" = "yes"
|
||||||
|
then
|
||||||
|
AC_SUBST(TARGET,"$host_alias")
|
||||||
|
fi
|
||||||
|
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
|
||||||
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
|
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
|
||||||
|
|
||||||
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
|
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
|
||||||
$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
|
$(WINEBUILD) $(TARGET:%=--target %) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
|
||||||
|
|
||||||
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
|
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
|
|
Loading…
Reference in New Issue