[gnome-builder/wip/tintou/mingw-find-path] mingw: Do not hardcode mingw location
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/tintou/mingw-find-path] mingw: Do not hardcode mingw location
- Date: Thu, 8 Feb 2018 10:39:35 +0000 (UTC)
commit 63ce0eecda51085e4f28db134b1277645e4426a9
Author: Corentin Noël <corentin noel collabora co uk>
Date: Thu Feb 8 10:37:08 2018 +0000
mingw: Do not hardcode mingw location
src/plugins/mingw/ide-mingw-device-provider.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/mingw/ide-mingw-device-provider.c b/src/plugins/mingw/ide-mingw-device-provider.c
index 16ee0f480..e10fa23c9 100644
--- a/src/plugins/mingw/ide-mingw-device-provider.c
+++ b/src/plugins/mingw/ide-mingw-device-provider.c
@@ -68,6 +68,7 @@ ide_mingw_device_provider_discover_worker (GTask *task,
IdeMingwDeviceProvider *self = source_object;
GPtrArray *devices;
IdeContext *context;
+ gchar *mingw_path;
g_assert (G_IS_TASK (task));
g_assert (IDE_IS_MINGW_DEVICE_PROVIDER (self));
@@ -85,10 +86,12 @@ ide_mingw_device_provider_discover_worker (GTask *task,
* Someone that knows how this works, please fix this up!
*/
- if (g_file_test ("/usr/bin/x86_64-w64-mingw32-gcc", G_FILE_TEST_EXISTS))
+ mingw_path = g_find_program_in_path ("x86_64-w64-mingw32-gcc");
+ if (mingw_path != NULL)
{
IdeDevice *device;
+ g_free (mingw_path);
/* add 64-bit mingw device */
device = ide_mingw_device_new (context,
_("MinGW 64-bit"),
@@ -97,10 +100,12 @@ ide_mingw_device_provider_discover_worker (GTask *task,
g_ptr_array_add (devices, device);
}
- if (g_file_test ("/usr/bin/i686-w64-mingw32-gcc", G_FILE_TEST_EXISTS))
+ mingw_path = g_find_program_in_path ("i686-w64-mingw32-gcc");
+ if (mingw_path != NULL)
{
IdeDevice *device;
+ g_free (mingw_path);
/* add 32-bit mingw device */
device = ide_mingw_device_new (context,
_("MinGW 32-bit"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]