|
@@ -409,15 +409,15 @@ path_toolname() {
|
|
|
clang) toolname="clang";;
|
|
|
clang-*) toolname="clang";;
|
|
|
*/clang-*) toolname="clang";;
|
|
|
- */emcc) toolname="clang";;
|
|
|
- emcc) toolname="clang";;
|
|
|
- */em++) toolname="clangxx";;
|
|
|
- em++) toolname="clangxx";;
|
|
|
+ */emcc) toolname="emcc";;
|
|
|
+ emcc) toolname="emcc";;
|
|
|
+ */em++) toolname="emxx";;
|
|
|
+ em++) toolname="emxx";;
|
|
|
*-ar) toolname="ar";;
|
|
|
*/ar) toolname="ar";;
|
|
|
ar) toolname="ar";;
|
|
|
- */emar) toolname="ar";;
|
|
|
- emar) toolname="ar";;
|
|
|
+ */emar) toolname="emar";;
|
|
|
+ emar) toolname="emar";;
|
|
|
cc) toolname="gcc";;
|
|
|
*/cc) toolname="gcc";;
|
|
|
c++) toolname="gxx";;
|
|
@@ -946,6 +946,8 @@ _get_abstract_flags() {
|
|
|
gxx) _get_abstract_flag_for_gcc_clang "${toolkind}" "${toolname}" "${itemname}" "${value}"; flag="${_ret}";;
|
|
|
clang) _get_abstract_flag_for_gcc_clang "${toolkind}" "${toolname}" "${itemname}" "${value}"; flag="${_ret}";;
|
|
|
clangxx) _get_abstract_flag_for_gcc_clang "${toolkind}" "${toolname}" "${itemname}" "${value}"; flag="${_ret}";;
|
|
|
+ emcc) _get_abstract_flag_for_gcc_clang "${toolkind}" "${toolname}" "${itemname}" "${value}"; flag="${_ret}";;
|
|
|
+ emxx) _get_abstract_flag_for_gcc_clang "${toolkind}" "${toolname}" "${itemname}" "${value}"; flag="${_ret}";;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
if test_nz "${flag}"; then
|
|
@@ -1595,7 +1597,10 @@ _get_target_toolchain_flags() {
|
|
|
gxx) _get_target_toolchain_flags_for_gcc "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
clang) _get_target_toolchain_flags_for_clang "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
clangxx) _get_target_toolchain_flags_for_clang "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
+ emcc) _get_target_toolchain_flags_for_clang "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
+ emxx) _get_target_toolchain_flags_for_clang "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
ar) _get_target_toolchain_flags_for_ar "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
+ emar) _get_target_toolchain_flags_for_ar "${name}" "${toolkind}"; flags="${_ret}";;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
_ret="${flags}"
|
|
@@ -2951,6 +2956,8 @@ _toolchain_compcmd() {
|
|
|
gxx) _toolchain_compcmd_for_gcc_clang "${program}" "${objectfile}" "${sourcefile}" "${flags}"; compcmd="${_ret}";;
|
|
|
clang) _toolchain_compcmd_for_gcc_clang "${program}" "${objectfile}" "${sourcefile}" "${flags}"; compcmd="${_ret}";;
|
|
|
clangxx) _toolchain_compcmd_for_gcc_clang "${program}" "${objectfile}" "${sourcefile}" "${flags}"; compcmd="${_ret}";;
|
|
|
+ emcc) _toolchain_compcmd_for_gcc_clang "${program}" "${objectfile}" "${sourcefile}" "${flags}"; compcmd="${_ret}";;
|
|
|
+ emxx) _toolchain_compcmd_for_gcc_clang "${program}" "${objectfile}" "${sourcefile}" "${flags}"; compcmd="${_ret}";;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
_ret="${compcmd}"
|
|
@@ -2969,7 +2976,10 @@ _toolchain_linkcmd() {
|
|
|
gxx) _toolchain_linkcmd_for_gcc_clang "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
clang) _toolchain_linkcmd_for_gcc_clang "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
clangxx) _toolchain_linkcmd_for_gcc_clang "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
+ emcc) _toolchain_linkcmd_for_gcc_clang "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
+ emxx) _toolchain_linkcmd_for_gcc_clang "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
ar) _toolchain_linkcmd_for_ar "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
+ emar) _toolchain_linkcmd_for_ar "${toolkind}" "${program}" "${binaryfile}" "${objectfiles}" "${flags}"; linkcmd="${_ret}";;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
_ret="${linkcmd}"
|
|
@@ -3104,7 +3114,10 @@ _toolchain_try_program() {
|
|
|
gxx) _toolchain_try_gxx "${kind}" "${program}" && ok=true;;
|
|
|
clang) _toolchain_try_clang "${kind}" "${program}" && ok=true;;
|
|
|
clangxx) _toolchain_try_clangxx "${kind}" "${program}" && ok=true;;
|
|
|
+ emcc) _toolchain_try_clang "${kind}" "${program}" && ok=true;;
|
|
|
+ emxx) _toolchain_try_clangxx "${kind}" "${program}" && ok=true;;
|
|
|
ar) _toolchain_try_ar "${kind}" "${program}" && ok=true;;
|
|
|
+ emar) _toolchain_try_ar "${kind}" "${program}" && ok=true;;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
if ${ok}; then
|
|
@@ -3835,6 +3848,8 @@ _gmake_add_build_object() {
|
|
|
gxx) _gmake_add_build_object_for_gcc_clang "${sourcekind}" "${sourcefile}" "${objectfile}" "${flagname}";;
|
|
|
clang) _gmake_add_build_object_for_gcc_clang "${sourcekind}" "${sourcefile}" "${objectfile}" "${flagname}";;
|
|
|
clangxx) _gmake_add_build_object_for_gcc_clang "${sourcekind}" "${sourcefile}" "${objectfile}" "${flagname}";;
|
|
|
+ emcc) _gmake_add_build_object_for_gcc_clang "${sourcekind}" "${sourcefile}" "${objectfile}" "${flagname}";;
|
|
|
+ emxx) _gmake_add_build_object_for_gcc_clang "${sourcekind}" "${sourcefile}" "${objectfile}" "${flagname}";;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
echo "" >> "${xmake_sh_makefile}"
|
|
@@ -3913,7 +3928,10 @@ _gmake_add_build_target() {
|
|
|
gxx) _gmake_add_build_target_for_gcc_clang "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
clang) _gmake_add_build_target_for_gcc_clang "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
clangxx) _gmake_add_build_target_for_gcc_clang "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
+ emcc) _gmake_add_build_target_for_gcc_clang "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
+ emxx) _gmake_add_build_target_for_gcc_clang "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
ar) _gmake_add_build_target_for_ar "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
+ emar) _gmake_add_build_target_for_ar "${toolkind}" "${targetfile}" "${objectfiles}" "${flagname}";;
|
|
|
*) raise "unknown toolname(${toolname})!" ;;
|
|
|
esac
|
|
|
echo "" >> "${xmake_sh_makefile}"
|