Skip to content

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

winegcc: Don't pass the as/ld/nm tool names to winebuild.

parent fbb43c42
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 328 deletions
Make.rules.in
View file @ b09418b5
...@@ -44,9 +44,6 @@ WINDRES = @WINDRES@ ...@@ -44,9 +44,6 @@ WINDRES = @WINDRES@
LN = @LN@ LN = @LN@
LN_S = @LN_S@ LN_S = @LN_S@
TOOLSDIR = @TOOLSDIR@ TOOLSDIR = @TOOLSDIR@
AS = @AS@
LD = @LD@
NM = @NM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
PRELINK = @PRELINK@ PRELINK = @PRELINK@
RM = rm -f RM = rm -f
...@@ -143,9 +140,6 @@ filter: dummy ...@@ -143,9 +140,6 @@ filter: dummy
.c.o: .c.o:
$(CC) -c $(ALLCFLAGS) -o $@ $< $(CC) -c $(ALLCFLAGS) -o $@ $<
.s.o:
$(AS) -o $@ $<
.y.tab.c: .y.tab.c:
$(BISON) $(BISONFLAGS) -p $*_ -o $@ $< $(BISON) $(BISONFLAGS) -p $*_ -o $@ $<
......
configure
View file @ b09418b5
...@@ -738,12 +738,6 @@ RANLIB ...@@ -738,12 +738,6 @@ RANLIB
ARFLAGS ARFLAGS
ac_ct_AR ac_ct_AR
AR AR
ac_ct_NM
NM
ac_ct_LD
LD
ac_ct_AS
AS
BISON BISON
FLEX FLEX
TOOLSDIR TOOLSDIR
...@@ -4065,306 +4059,6 @@ $as_echo "$as_me: error: no suitable bison found. Please install the 'bison' pac ...@@ -4065,306 +4059,6 @@ $as_echo "$as_me: error: no suitable bison found. Please install the 'bison' pac
fi fi
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
for ac_prog in gas as
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AS+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
ac_cv_prog_AS="$AS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AS="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
AS=$ac_cv_prog_AS
if test -n "$AS"; then
{ $as_echo "$as_me:$LINENO: result: $AS" >&5
$as_echo "$AS" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$AS" && break
done
fi
if test -z "$AS"; then
ac_ct_AS=$AS
for ac_prog in gas as
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AS="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_AS=$ac_cv_prog_ac_ct_AS
if test -n "$ac_ct_AS"; then
{ $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
$as_echo "$ac_ct_AS" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$ac_ct_AS" && break
done
if test "x$ac_ct_AS" = x; then
AS="as"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
AS=$ac_ct_AS
fi
fi
if test -n "$ac_tool_prefix"; then
for ac_prog in ld gld
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LD+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$LD"; then
ac_cv_prog_LD="$LD" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
LD=$ac_cv_prog_LD
if test -n "$LD"; then
{ $as_echo "$as_me:$LINENO: result: $LD" >&5
$as_echo "$LD" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$LD" && break
done
fi
if test -z "$LD"; then
ac_ct_LD=$LD
for ac_prog in ld gld
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LD"; then
ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LD="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_LD=$ac_cv_prog_ac_ct_LD
if test -n "$ac_ct_LD"; then
{ $as_echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
$as_echo "$ac_ct_LD" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$ac_ct_LD" && break
done
if test "x$ac_ct_LD" = x; then
LD="ld"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
LD=$ac_ct_LD
fi
fi
if test -n "$ac_tool_prefix"; then
for ac_prog in nm gnm
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_NM+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
ac_cv_prog_NM="$NM" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
NM=$ac_cv_prog_NM
if test -n "$NM"; then
{ $as_echo "$as_me:$LINENO: result: $NM" >&5
$as_echo "$NM" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$NM" && break
done
fi
if test -z "$NM"; then
ac_ct_NM=$NM
for ac_prog in nm gnm
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NM"; then
ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NM="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_NM=$ac_cv_prog_ac_ct_NM
if test -n "$ac_ct_NM"; then
{ $as_echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
$as_echo "$ac_ct_NM" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$ac_ct_NM" && break
done
if test "x$ac_ct_NM" = x; then
NM="nm"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
NM=$ac_ct_NM
fi
fi
if test -n "$ac_tool_prefix"; then
for ac_prog in ar gar for ac_prog in ar gar
do do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
......
configure.ac
View file @ b09418b5
...@@ -199,9 +199,6 @@ then ...@@ -199,9 +199,6 @@ then
AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.]) AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])
fi fi
AC_CHECK_TOOLS(AS,[gas as],as)
AC_CHECK_TOOLS(LD,[ld gld],ld)
AC_CHECK_TOOLS(NM,[nm gnm],nm)
AC_CHECK_TOOLS(AR,[ar gar],ar) AC_CHECK_TOOLS(AR,[ar gar],ar)
AC_SUBST(ARFLAGS,rc) AC_SUBST(ARFLAGS,rc)
AC_PROG_RANLIB AC_PROG_RANLIB
......
tools/winegcc/Makefile.in
View file @ b09418b5
...@@ -4,12 +4,9 @@ DEFS = \ ...@@ -4,12 +4,9 @@ DEFS = \
-DLIBDIR="\"$(libdir)\"" \ -DLIBDIR="\"$(libdir)\"" \
-DDLLFLAGS="\"@DLLFLAGS@\"" \ -DDLLFLAGS="\"@DLLFLAGS@\"" \
-DLDDLLFLAGS="\"@LDDLLFLAGS@\"" \ -DLDDLLFLAGS="\"@LDDLLFLAGS@\"" \
-DAS="\"$(AS)\"" \
-DCC="\"$(CC)\"" \ -DCC="\"$(CC)\"" \
-DCPP="\"@CPPBIN@\"" \ -DCPP="\"@CPPBIN@\"" \
-DCXX="\"@CXX@\"" \ -DCXX="\"@CXX@\"" \
-DLD="\"$(LD)\"" \
-DNM="\"$(NM)\"" \
-DPRELINK="\"$(PRELINK)\"" -DPRELINK="\"$(PRELINK)\""
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
......
tools/winegcc/winegcc.c
View file @ b09418b5
...@@ -294,6 +294,7 @@ static const strarray* get_translator(struct options *opts) ...@@ -294,6 +294,7 @@ static const strarray* get_translator(struct options *opts)
else str = CPP; else str = CPP;
break; break;
case proc_cc: case proc_cc:
case proc_as:
if (opts->target) str = strmake( "%s-gcc", opts->target ); if (opts->target) str = strmake( "%s-gcc", opts->target );
else str = CC; else str = CC;
break; break;
...@@ -301,21 +302,12 @@ static const strarray* get_translator(struct options *opts) ...@@ -301,21 +302,12 @@ static const strarray* get_translator(struct options *opts)
if (opts->target) str = strmake( "%s-g++", opts->target ); if (opts->target) str = strmake( "%s-g++", opts->target );
else str = CXX; else str = CXX;
break; break;
case proc_as:
if (opts->target) str = strmake( "%s-as", opts->target );
else str = AS;
break;
default: default:
assert(0); assert(0);
} }
ret = strarray_fromstring( str, " " ); ret = strarray_fromstring( str, " " );
if (opts->force_pointer_size) if (opts->force_pointer_size)
{ strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size ));
if (opts->processor == proc_as)
strarray_add( ret, strmake("--%u", 8 * opts->force_pointer_size ));
else
strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size ));
}
return ret; return ret;
} }
......
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