Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
0eea1b09
Commit
0eea1b09
authored
Mar 04, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Try using explicit target option for cross compiling.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4ec4988c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
0 deletions
+58
-0
configure
configure
+44
-0
configure.ac
configure.ac
+14
-0
No files found.
configure
View file @
0eea1b09
...
@@ -9812,6 +9812,50 @@ $as_echo "$wine_cv_crosscc" >&6; }
...
@@ -9812,6 +9812,50 @@ $as_echo "$wine_cv_crosscc" >&6; }
esac
esac
shift
shift
done
done
llvm_target
=
$CROSSTARGET
if
test
-z
"
$llvm_target
"
then
case
$host_cpu
in
*
i[3456789]86
*
)
llvm_target
=
i686-windows-gnu
;;
*
)
llvm_target
=
$host_cpu
-windows-gnu
;;
esac
fi
as_ac_var
=
`
$as_echo
"ac_cv_crosscflags_-target
$llvm_target
-fuse-ld=lld"
|
$as_tr_sh
`
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the cross-compiler supports -target
$llvm_target
-fuse-ld=lld"
>
&5
$as_echo_n
"checking whether the cross-compiler supports -target
$llvm_target
-fuse-ld=lld... "
>
&6
;
}
if
eval
\$
{
$as_ac_var
+:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
ac_wine_try_cflags_saved
=
$CFLAGS
ac_wine_try_cflags_saved_cc
=
$CC
ac_wine_try_cflags_saved_exeext
=
$ac_exeext
CFLAGS
=
"
$CFLAGS
$EXTRACROSSCFLAGS
-nostartfiles -nodefaultlibs -target
$llvm_target
-fuse-ld=lld"
CC
=
"
$CROSSCC
"
ac_exeext
=
".exe"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
void __stdcall __delayLoadHelper2(void *descr, void *addr) {} int __cdecl mainCRTStartup(void) { return 0; }
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
eval
"
$as_ac_var
=yes"
else
eval
"
$as_ac_var
=no"
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
CFLAGS
=
$ac_wine_try_cflags_saved
CC
=
$ac_wine_try_cflags_saved_cc
ac_exeext
=
$ac_wine_try_cflags_saved_exeext
fi
eval
ac_res
=
\$
$as_ac_var
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_res
"
>
&5
$as_echo
"
$ac_res
"
>
&6
;
}
if
eval test
\"
x
\$
"
$as_ac_var
"
\"
=
x
"yes"
;
then
:
CROSSTARGET
=
$llvm_target
EXTRACROSSCFLAGS
=
"
$EXTRACROSSCFLAGS
-target
$CROSSTARGET
"
CFLAGS
=
"
$CFLAGS
-fuse-ld=lld"
fi
fi
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the cross-compiler supports -fno-strict-aliasing"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether the cross-compiler supports -fno-strict-aliasing"
>
&5
$as_echo_n
"checking whether the cross-compiler supports -fno-strict-aliasing... "
>
&6
;
}
$as_echo_n
"checking whether the cross-compiler supports -fno-strict-aliasing... "
>
&6
;
}
...
...
configure.ac
View file @
0eea1b09
...
@@ -1041,6 +1041,20 @@ then
...
@@ -1041,6 +1041,20 @@ then
esac
esac
shift
shift
done
done
dnl Check if cross compiler supports -target argument
llvm_target=$CROSSTARGET
if test -z "$llvm_target"
then
case $host_cpu in
*i[[3456789]]86*) llvm_target=i686-windows-gnu ;;
*) llvm_target=$host_cpu-windows-gnu ;;
esac
fi
WINE_TRY_CROSSCFLAGS([-target $llvm_target -fuse-ld=lld],
[CROSSTARGET=$llvm_target
EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET"
CFLAGS="$CFLAGS -fuse-ld=lld"])
fi
fi
WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing])
WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing])
dnl clang needs to be told to fail on unknown options
dnl clang needs to be told to fail on unknown options
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment