[gnome-builder] subprocess: set /usr/local/bin for FreeBSD when clearing environment

[Christian Hergert <chergert src gnome org>]

commit 906ebc2fb51effc9ff1d5e8a9361dda8668d2a2e
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 25 14:51:32 2018 -0800

    subprocess: set /usr/local/bin for FreeBSD when clearing environment
    
    I very much don't want to be using random /usr/local/bin stuff on Linux,
    but for FreeBSD it puts third-party software there.
    
    This is better than using append_path() because that could set a single
    path part if $PATH has not been set.
    
    #361

 src/libide/subprocess/ide-subprocess-launcher.c     | 5 +++++
 src/plugins/autotools/ide-autotools-autogen-stage.c | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/libide/subprocess/ide-subprocess-launcher.c b/src/libide/subprocess/ide-subprocess-launcher.c
index 957305452..62ed01110 100644
--- a/src/libide/subprocess/ide-subprocess-launcher.c
+++ b/src/libide/subprocess/ide-subprocess-launcher.c
@@ -394,7 +394,12 @@ ide_subprocess_launcher_real_spawn (IdeSubprocessLauncher  *self,
        * that it can get /app/bin too. Since it chains up to us, we wont
        * overwrite PATH in that case (which is what we want).
        */
+#ifdef __FreeBSD__
+      /* FreeBSD puts third-party components in /usr/local/bin */
+      ide_subprocess_launcher_setenv (self, "PATH", "/usr/local/bin:/usr/bin:/bin", FALSE);
+#else
       ide_subprocess_launcher_setenv (self, "PATH", "/usr/bin:/bin", FALSE);
+#endif
       ide_subprocess_launcher_setenv (self, "HOME", g_get_home_dir (), FALSE);
       ide_subprocess_launcher_setenv (self, "USER", g_get_user_name (), FALSE);
       ide_subprocess_launcher_setenv (self, "LANG", g_getenv ("LANG"), FALSE);
diff --git a/src/plugins/autotools/ide-autotools-autogen-stage.c 
b/src/plugins/autotools/ide-autotools-autogen-stage.c
index 7632f8524..435f567c9 100644
--- a/src/plugins/autotools/ide-autotools-autogen-stage.c
+++ b/src/plugins/autotools/ide-autotools-autogen-stage.c
@@ -98,11 +98,6 @@ ide_autotools_autogen_stage_execute_async (IdeBuildStage       *stage,
       ide_subprocess_launcher_push_argv (launcher, "-fiv");
     }
 
-#ifdef __FreeBSD__
-  /* FreeBSD has autoreconf in /usr/local/bin */
-  ide_subprocess_launcher_append_path (launcher, "/usr/local/bin");
-#endif
-
   subprocess = ide_subprocess_launcher_spawn (launcher, cancellable, &error);
 
   if (subprocess == NULL)