Commit 8c84636c authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Specify the target flags directly from configure to avoid trouble on BSD make.

parent 034a7f88
......@@ -43,7 +43,6 @@ STRIP = @STRIP@
WINDRES = @WINDRES@
LN = @LN@
LN_S = @LN_S@
TARGET = @TARGET@
TOOLSDIR = @TOOLSDIR@
AS = @AS@
LD = @LD@
......@@ -62,7 +61,8 @@ EXTRACFLAGS = @EXTRACFLAGS@
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
WINEBUILDFLAGS = $(DLLFLAGS) $(TARGET:%=--target %) --as-cmd "$(AS)"
TARGETFLAGS = @TARGETFLAGS@
WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) --as-cmd "$(AS)"
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
......
......@@ -745,7 +745,7 @@ X_PRE_LIBS
X_CFLAGS
CPP
XMKMF
TARGET
TARGETFLAGS
TOOLSDIR
WIN16_INSTALL
WIN16_FILES
......@@ -3932,7 +3932,7 @@ TOOLSDIR=$wine_cv_toolsdir
if test "$cross_compiling" = "yes"
then
TARGET="$host_alias"
TARGETFLAGS="-b $host_alias"
fi
......
......@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
if test "$cross_compiling" = "yes"
then
AC_SUBST(TARGET,"$host_alias")
AC_SUBST(TARGETFLAGS,"-b $host_alias")
fi
AC_PATH_XTRA
......
......@@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
$(WINEBUILD) $(TARGET:%=--target %) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
$(WINEBUILD) $(TARGETFLAGS) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(RM) $@
......
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