Kaydet (Commit) 628ee842 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

remove unused CC_X64_BINARY

üst 69b6ca8e
...@@ -2602,7 +2602,7 @@ if test "$_os" = "WINNT"; then ...@@ -2602,7 +2602,7 @@ if test "$_os" = "WINNT"; then
# unfished work and highly experimental. # unfished work and highly experimental.
BUILD_X64= BUILD_X64=
CC_X64_BINARY= CXX_X64_BINARY=
LINK_X64_BINARY= LINK_X64_BINARY=
LIBMGR_X64_BINARY= LIBMGR_X64_BINARY=
...@@ -2612,13 +2612,11 @@ if test "$_os" = "WINNT"; then ...@@ -2612,13 +2612,11 @@ if test "$_os" = "WINNT"; then
# the build on a 64-bit OS. # the build on a 64-bit OS.
if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
BUILD_X64=TRUE BUILD_X64=TRUE
CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe" CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe" LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe" LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
BUILD_X64=TRUE BUILD_X64=TRUE
CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe" CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe" LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe" LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
...@@ -2634,7 +2632,6 @@ if test "$_os" = "WINNT"; then ...@@ -2634,7 +2632,6 @@ if test "$_os" = "WINNT"; then
# These are passed to the environment through set_soenv.in as usual, and then # These are passed to the environment through set_soenv.in as usual, and then
# used in set_wntx64.mk # used in set_wntx64.mk
AC_SUBST(CC_X64_BINARY)
AC_SUBST(CXX_X64_BINARY) AC_SUBST(CXX_X64_BINARY)
AC_SUBST(LINK_X64_BINARY) AC_SUBST(LINK_X64_BINARY)
AC_SUBST(LIBMGR_X64_BINARY) AC_SUBST(LIBMGR_X64_BINARY)
......
...@@ -743,7 +743,6 @@ if ( $platform =~ m/cygwin/ ) ...@@ -743,7 +743,6 @@ if ( $platform =~ m/cygwin/ )
# found the 64-bit (cross-)compiler, then @BUILD_X64@ will be empty. # found the 64-bit (cross-)compiler, then @BUILD_X64@ will be empty.
ToFile( "BUILD_X64", "@BUILD_X64@", "e" ); ToFile( "BUILD_X64", "@BUILD_X64@", "e" );
if ( "@BUILD_X64@" eq "TRUE" ) { if ( "@BUILD_X64@" eq "TRUE" ) {
ToFile( "CC_X64_BINARY", "@CC_X64_BINARY@", "e" );
ToFile( "CXX_X64_BINARY","@CXX_X64_BINARY@", "e" ); ToFile( "CXX_X64_BINARY","@CXX_X64_BINARY@", "e" );
ToFile( "LINK_X64_BINARY","@LINK_X64_BINARY@","e" ); ToFile( "LINK_X64_BINARY","@LINK_X64_BINARY@","e" );
ToFile( "LIBMGR_X64_BINARY","@LIBMGR_X64_BINARY@","e" ); ToFile( "LIBMGR_X64_BINARY","@LIBMGR_X64_BINARY@","e" );
......
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