Changeset View
Changeset View
Standalone View
Standalone View
devel/mingw-w64-clang-wrapper/files/patch-wrappers_windres-wrapper.c
| --- wrappers/windres-wrapper.c.orig 2020-02-17 07:59:25 UTC | |||||
| +++ wrappers/windres-wrapper.c | |||||
| @@ -156,6 +156,8 @@ int _tmain(int argc, TCHAR* argv[]) { | |||||
| if (!target) | |||||
| target = _T(DEFAULT_TARGET); | |||||
| + const TCHAR *llvmdir = LLVM_PREFIX"/bin/"; | |||||
| + | |||||
| const TCHAR *bfd_target = NULL; | |||||
| const TCHAR *input = _T("-"); | |||||
| const TCHAR *output = _T("/dev/stdout"); | |||||
| @@ -328,7 +330,7 @@ int _tmain(int argc, TCHAR* argv[]) { | |||||
| } | |||||
| arg = 0; | |||||
| - exec_argv[arg++] = concat(dir, _T("llvm-rc")); | |||||
| + exec_argv[arg++] = concat(llvmdir, _T("llvm-rc")); | |||||
| for (int i = 0; i < nb_rc_options; i++) | |||||
| exec_argv[arg++] = rc_options[i]; | |||||
| exec_argv[arg++] = _T("-I"); | |||||
| @@ -362,7 +364,7 @@ int _tmain(int argc, TCHAR* argv[]) { | |||||
| // All done | |||||
| } else if (!_tcscmp(output_format, _T("coff"))) { | |||||
| arg = 0; | |||||
| - exec_argv[arg++] = concat(dir, _T("llvm-cvtres")); | |||||
| + exec_argv[arg++] = concat(llvmdir, _T("llvm-cvtres")); | |||||
| exec_argv[arg++] = res; | |||||
| exec_argv[arg++] = concat(_T("-machine:"), machine); | |||||
| exec_argv[arg++] = concat(_T("-out:"), output); | |||||
| @@ -385,7 +387,7 @@ int _tmain(int argc, TCHAR* argv[]) { | |||||
| error(basename, _T("invalid output format: `"TS"'"), output_format); | |||||
| } | |||||
| } else if (!_tcscmp(input_format, _T("res"))) { | |||||
| - exec_argv[arg++] = concat(dir, _T("llvm-cvtres")); | |||||
| + exec_argv[arg++] = concat(llvmdir, _T("llvm-cvtres")); | |||||
| exec_argv[arg++] = input; | |||||
| exec_argv[arg++] = concat(_T("-machine:"), machine); | |||||
| exec_argv[arg++] = concat(_T("-out:"), output); | |||||