Skip to content

W
wine-cw
Commit 7a3c56a9 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Remove some no longer used variables.

parent ec56eee0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 12 deletions
configure
View file @ 7a3c56a9
...@@ -4043,8 +4043,6 @@ case $host in ...@@ -4043,8 +4043,6 @@ case $host in
then then
CC="$CC -m64" CC="$CC -m64"
CXX="$CXX -m64" CXX="$CXX -m64"
LD="${LD:-ld} -arch x86_64"
AS="${AS:-as} -arch x86_64"
host_cpu="x86_64" host_cpu="x86_64"
notice_platform="64-bit " notice_platform="64-bit "
TARGETFLAGS="-m64" TARGETFLAGS="-m64"
...@@ -4052,8 +4050,6 @@ case $host in ...@@ -4052,8 +4050,6 @@ case $host in
else else
CC="$CC -m32" CC="$CC -m32"
CXX="$CXX -m32" CXX="$CXX -m32"
LD="${LD:-ld} -arch i386"
AS="${AS:-as} -arch i386"
host_cpu="i386" host_cpu="i386"
notice_platform="32-bit " notice_platform="32-bit "
TARGETFLAGS="-m32" TARGETFLAGS="-m32"
...@@ -4090,8 +4086,6 @@ $as_echo "no" >&6; } ...@@ -4090,8 +4086,6 @@ $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LD="${LD:-ld} -m elf_i386"
AS="${AS:-as} --32"
host_cpu="i386" host_cpu="i386"
notice_platform="32-bit " notice_platform="32-bit "
TARGETFLAGS="-m32" TARGETFLAGS="-m32"
......
configure.ac
View file @ 7a3c56a9
...@@ -132,16 +132,12 @@ case $host in ...@@ -132,16 +132,12 @@ case $host in
then then
CC="$CC -m64" CC="$CC -m64"
CXX="$CXX -m64" CXX="$CXX -m64"
LD="${LD:-ld} -arch x86_64"
AS="${AS:-as} -arch x86_64"
host_cpu="x86_64" host_cpu="x86_64"
notice_platform="64-bit " notice_platform="64-bit "
AC_SUBST(TARGETFLAGS,"-m64") AC_SUBST(TARGETFLAGS,"-m64")
else else
CC="$CC -m32" CC="$CC -m32"
CXX="$CXX -m32" CXX="$CXX -m32"
LD="${LD:-ld} -arch i386"
AS="${AS:-as} -arch i386"
host_cpu="i386" host_cpu="i386"
notice_platform="32-bit " notice_platform="32-bit "
AC_SUBST(TARGETFLAGS,"-m32") AC_SUBST(TARGETFLAGS,"-m32")
...@@ -157,8 +153,6 @@ case $host in ...@@ -157,8 +153,6 @@ case $host in
AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]),
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])]) AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])])
LD="${LD:-ld} -m elf_i386"
AS="${AS:-as} --32"
host_cpu="i386" host_cpu="i386"
notice_platform="32-bit " notice_platform="32-bit "
AC_SUBST(TARGETFLAGS,"-m32") AC_SUBST(TARGETFLAGS,"-m32")
......
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