solver doesn't solve anything...

... it is an abbreviation of "Solar Version".

Since nobody can remember that:

remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath
and any mention thereof.

Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad
Reviewed-on: https://gerrit.libreoffice.org/6515
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

35 files changed, 44 insertions, 88 deletions

diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index 8c3f935e3419..847f022e0daa 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -17,10 +17,10 @@ if [ -z "$INPATH" ] ; then
     exit 1
 fi
 
-# --with-outpath includes solver/$INPATH/inc
+# TODO: should this include workdir headers?
 if [ "$1" = "--with-outpath" ]; then
-    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|instdir\|install\)\//d'` solver/$INPATH/inc"
+    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
 else
-    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|instdir\|install\)\//d'`"
+    dirs="`ls -d */* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
 fi
 mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl java make' --statistics $dirs
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 4cd6cdd67b88..55847f2e5d54 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -18,5 +18,5 @@ fi
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
       --languages=-HTML,Java,JavaScript \
-      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=solver \
-      --exclude=clone --exclude=install --totals=yes *
+      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=workdir \
+      --exclude=clone --totals=yes *
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index deea124b817e..bd80505bb5f7 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -256,7 +256,7 @@ sub check_makecab_version
 
 ######################################################################
 # Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, os, pmiscpath
+# solarenvpath, os, pmiscpath
 ######################################################################
 
 sub check_system_environment
@@ -265,7 +265,6 @@ sub check_system_environment
     my $error = 0;
 
     my @environmentvariables = qw(
-        SOLARVERSION
         WORK_STAMP
         OUTPATH
         LOCAL_OUT
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 4d3bd6745ac2..1db93452b3f1 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -187,7 +187,7 @@ sub call_sum
 }
 
 #########################################################
-# Searching for the getuid.so in the solver
+# Searching for the getuid.so
 #########################################################
 
 sub get_path_for_library
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 2bcd7ccdf847..a3c2c0bafb2a 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -31,10 +31,7 @@ sub create_pathvariables
     my %variables = ();
 
     # The following variables are needed in the path file list
-    # solarpath, solarenvpath, os, pmiscpath
-
-    my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
-    $variables{'solarpath'} = $solarpath;
+    # solarenvpath, os, pmiscpath
 
     my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl";
     $variables{'shlxthdlpath'} = $shlxthdlpath;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 0cc6e9e0c753..9d1c200e89b1 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -514,7 +514,7 @@ sub outputparameter
     }
     else
     {
-        push(@output, "Taking setup script from solver\n");
+        push(@output, "Taking setup script from workdir\n");
     }
     push(@output, "Unpackpath: $installer::globals::unpackpath\n");
     push(@output, "Compiler: $installer::globals::compiler\n");
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 554e0d847a94..8ed693fe4414 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -347,7 +347,7 @@ sub create_package
             my $scripthelperrealfilename = $volume_name_classic_app;
             my $translationfilename = $installer::globals::macinstallfilename;
 
-            # Finding both files in solver
+            # Finding both files in source tree
 
             my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename;
             if (! -f $scriptref) { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); }
@@ -374,7 +374,7 @@ sub create_package
             chmod 0775, $scripthelperrealfilename;
 
             # Copy also Info.plist and icon file
-            # Finding both files in solver
+            # Finding both files in source tree
             my $iconfile = "ooo3_installer.icns";
             my $iconfileref = $ENV{'SRCDIR'} . "/setup_native/source/mac/" . $iconfile;
             if (! -f $iconfileref) { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile ($iconfileref)!", "create_package"); }
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 261bd19d6d86..917066f4f784 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -526,7 +526,7 @@ sub collect_scpactions
 
 ###########################################################
 # Adding additional variables into the variableshashref,
-# that are defined in include files in the solver. The
+# that are defined in include files in the source tree. The
 # names of the include files are stored in
 # ADD_INCLUDE_FILES (comma separated list).
 ###########################################################
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index d634b617669a..138195c42be1 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -40,9 +40,6 @@ if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') {
     $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
 }
 
-# Workaround for the Python
-$ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
-
 for $arg (@ARGV) {
     if ($arg eq '-s' || $arg eq '--strip') {
         $strip = "-strip";
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index d0fb5d254938..f47a8330ad71 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -25,7 +25,6 @@ static const Command SHELL;
 
 // gbuild root directorys
 static Path SRCDIR;
-static Path OUTDIR;
 static Path WORKDIR;
 
 // Expected from configure/environment
diff --git a/solenv/doc/gbuild/solenv/gbuild/helper.mk b/solenv/doc/gbuild/solenv/gbuild/helper.mk
index 33d034a08aad..f71c26915cf4 100644
--- a/solenv/doc/gbuild/solenv/gbuild/helper.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/helper.mk
@@ -40,12 +40,6 @@ namespace gb
             static void make_dep_target(TargetType t);
             /// Creates the default get_dep_target() function for the types.
             static void make_dep_targets(List<TargetType> ts);
-            /// Creates the default get_dep_target() function for the type modifying the \$(OUTDIR).
-            static void make_outdir_clean_target(TargetType t);
-            /// Creates the default get_dep_target() function for types modifying the \$(OUTDIR).
-            static void make_outdir_clean_targets(List<TargetType> ts);
-            /// Returns the clean target of a target modifying the \$(OUTDIR).
-            static Path get_outdir_clean_target(Path target);
 
             /// The path to a zero length file.
             static const Path NULLFILE;
diff --git a/solenv/doc/gbuild/solenv/gbuild/library.mk b/solenv/doc/gbuild/solenv/gbuild/library.mk
index 085989d50060..a20c96f9efd6 100644
--- a/solenv/doc/gbuild/solenv/gbuild/library.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/library.mk
@@ -44,7 +44,7 @@ namespace gb
             /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
             void forward_to_linktarget(Function f);
 
-            /// List of buildable libraries (i.e. libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            /// List of buildable libraries (i.e. libraries that are not expected to exist on the system).
             static const List<Library> TARGETS;
             /// List of additional defines for compiling objects for libraries
             static const List<String> DEFS;
diff --git a/solenv/doc/gbuild/solenv/gbuild/package.mk b/solenv/doc/gbuild/solenv/gbuild/package.mk
index 15c83081200f..d45eb5da5a2a 100644
--- a/solenv/doc/gbuild/solenv/gbuild/package.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/package.mk
@@ -38,10 +38,10 @@ namespace gb
     class Package : public Target, public IsCleanable
     {
         public:
-            /// Creates a new package that copies files from source_dir to the \$(OUTDIR).
+            /// Creates a new package that copies files from source_dir to the \$(INSTDIR).
             Package(String name, Path source_dir);
             /// Adds a file to the package. destination is the relative path in
-            /// the \$(OUTDIR) and source is the relative path in the source_dir.
+            /// the \$(INSTROOT) and source is the relative path in the source_dir.
             add_file(Path destination, Path source);
     }
 }
diff --git a/solenv/doc/gbuild/solenv/gbuild/static_library.mk b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
index d225b9e1439f..a6d529717f54 100644
--- a/solenv/doc/gbuild/solenv/gbuild/static_library.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
@@ -40,7 +40,7 @@ namespace gb
             /// helper function to wrap LinkTargets functions (this is more or less pimpl ...).
             void forward_to_linktarget(Function f);
 
-            /// List of buildable static libraries (i.e. static libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            /// List of buildable static libraries (i.e. static libraries that are not expected to exist on the system).
             static const List<StaticLibrary> TARGETS;
             /// List of additional defines for compiling objects for static libraries
             static const List<String> DEFS;
@@ -48,8 +48,6 @@ namespace gb
             static const List<String> TARGETTYPEFLAGS;
             /// Mapping from symbolic static library names to filenames
             static const Map<StaticLibrary,Path> FILENAMES;
-            /// location to place static libraries in the \$(OUTDIR)
-            static const Path OUTDIRLOCATION;
             /// platformdependant file extension for static libraries
             static const String PLAINEXT;
     };
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 7202064b813f..00bb460ba6fb 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -65,7 +65,7 @@ endif
 define gb_Deliver_deliver
 $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
  $(error gb_Deliver_deliver:\
-  file does not exist in solver, and cannot be delivered: $(2)))
+  file does not exist in instdir, and cannot be delivered: $(2)))
 endef
 
 define gb_Deliver_print_deliverable
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index b69544358717..b4ac8a2dc6fa 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -180,7 +180,7 @@ $(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if $(strip $(2)),$(strip
 
 endef
 
-# add a library from the solver; DO NOT use gb_Library_get_target
+# add a library from workdir; DO NOT use gb_Library_get_target
 define gb_Extension_add_library
 $(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\
 	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(2))))
@@ -192,7 +192,7 @@ $(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib)))
 
 endef
 
-# add an executable from the solver
+# add an executable
 define gb_Extension_add_executable
 $(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\
 	$(call gb_Executable_get_target,$(2)))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index cbfa04e88a0c..26b9f8edb585 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -200,9 +200,6 @@ $(1) : $(2) | $(dir $(1)).dir
 $(call gb_Deliver_add_deliverable,$(1),$(2),$(1))
 endef
 
-# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
-# for libraries from the OUTDIR
-
 define gb_Helper_optional
 $(if $(filter $(1),$(BUILD_TYPE)),$(2))
 endef
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 860b890aac98..ba5839c67552 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -75,7 +75,6 @@ endef
 define gb_Library__Library_impl_copy
 $(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR))
 $(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2))
-$(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2)
 endef
 
 # Note: there may be targets in 3 different directories: the library itself,
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b6d2ecf4259a..9669a5608849 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -508,8 +508,8 @@ $(WORKDIR)/Headers/% :
 
 # Explanation of some of the targets:
 # - gb_LinkTarget_get_headers_target is the target that guarantees all headers
-#   from the linked against the libraries and the linktargets own headers
-#   (including generated headers) are in the OUTDIR.
+#   from the linked against libraries and the linktargets own generated headers
+#   are generated.
 # - gb_LinkTarget_get_target links the objects into a file in WORKDIR.
 # gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target.
 # gb_LinkTarget_get_target depends additionally on the objects, which in turn
@@ -756,7 +756,7 @@ endef
 # call gb_LinkTarget_set_include,linktarget,includes
 define gb_LinkTarget_set_include
 $(call gb_LinkTarget__check_srcdir_paths,$(1),\
-    $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(OUTDIR)/% -I$(WORKDIR)/%,$(2)))))
+    $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(WORKDIR)/%,$(2)))))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
@@ -1392,7 +1392,7 @@ $$(call gb_Output_error,\
  gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.)
 endef
 
-# use a header package, possibly from another module (i.e. via OUTDIR)
+# use a header package, possibly from another module
 # call gb_LinkTarget_use_package,linktarget,package
 define gb_LinkTarget_use_package
 $(call gb_LinkTarget_get_headers_target,$(1)) :| \
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index ce38808a26c5..28943be87909 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -17,10 +17,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-# SdiTarget is evil, in that it does not support multiple repositories for now (hardcoded to SRCDIR)
-# Also there is no way to cleanly deliver the generated header to OUTDIR.
-# (This can be workarounded by using gb_Package, but really should not.)
-
 # SdiTarget class
 gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
 gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 0218a39cadb6..01db721f8e3b 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -25,12 +25,6 @@ gb_CliNativeLibrary_get_target = $(INSTROOT)/$(LIBO_URE_LIB_FOLDER)/$(1)$(gb_Cli
 gb_CliUnoApi_get_target = $(INSTROOT)/$(if $(filter cli_uretypes,$(1)),$(LIBO_URE_LIB_FOLDER),$(LIBO_LIB_FOLDER))/$(1)$(gb_CliUnoApi_EXT)
 gb_PackagePart_get_destinations = \
 	$(INSTDIR) \
-	$(OUTDIR)/bin \
-	$(OUTDIR)/lib \
-	$(OUTDIR)/par \
-	$(OUTDIR)/pck \
-	$(OUTDIR)/res \
-	$(OUTDIR)/share \
 	$(WORKDIR)/unittest \
 
 # kind of lame but with just 3 of these why bother with registration etc.
diff --git a/solenv/gbuild/extensions/pre_Counters.mk b/solenv/gbuild/extensions/pre_Counters.mk
index 65572df217d4..53cffcd63899 100644
--- a/solenv/gbuild/extensions/pre_Counters.mk
+++ b/solenv/gbuild/extensions/pre_Counters.mk
@@ -25,8 +25,6 @@ $(WORKDIR)/%:
 	$(eval gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE)+= x)
 	@true
 	
-$(OUTDIR)/%:
-	@true
-
 endif
+
 # vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 8830b694776e..d8fd15eca349 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -40,7 +40,7 @@ AVAILABLE TARGETS
        <module>.check   run unittests of the named module
        <module>.clean   clean the named module
        <module>.all     build the named module and the pre-requisite modules for it
-       <module>.showdeliverables show the targets delivered to OUTDIR and their
+       <module>.showdeliverables show the targets delivered to INSTDIR and their
                         source
        cmd              execute the command contained in the variable cmd=""
                         in a shell with config_host.mk or config_build.mk
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b7f2db535ae3..11f9bf4c8e1c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -267,15 +267,12 @@ $(eval $(call gb_Deliver_init))
 
 # We are using a set of scopes that we might as well call classes.
 
+# TODO: to what extent is the following still true?
 # It is important to include them in the right order as that is
 # -- at least in part -- defining precedence. This is not an issue in the
-# WORKDIR as there are no nameing collisions there, but OUTDIR is a mess
+# WORKDIR as there are no nameing collisions there, but INSTDIR is a mess
 # and precedence is important there. This is also platform dependant.
-# For example:
-# $(OUTDIR)/bin/% for executables collides
-#	with $(OUTDIR)/bin/%.res for resources on unix
-# $(OUTDIR)/lib/%.lib collides
-#	on windows (static and dynamic libs)
+#
 # This is less of an issue with GNU Make versions > 3.82 which matches for
 # shortest stem instead of first match. However, upon intoduction this version
 # is not available everywhere by default.
diff --git a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
index 670f1988054b..8251bc73884e 100644
--- a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
@@ -14,6 +14,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
index f7f1c4b2f4a1..ef2d97074501 100644
--- a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
@@ -13,6 +13,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 7d4fc6c086fa..19f3aa413bd6 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -286,7 +286,7 @@ endef
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
-gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_PYTHON_PRECOMMAND :=
 
 include $(GBUILDDIR)/platform/com_GCC_class.mk
 
diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index 93e4dd918d31..48a138d02257 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -16,7 +16,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index c1aee6b929f4..fc8b8ad26b22 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -15,7 +15,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 3f9600a76221..b53f72fbc57e 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -185,7 +185,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
+gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
 
 # $(1): list of : separated directory pathnames to append to the ld path
 define gb_Helper_extend_ld_path
@@ -197,6 +197,6 @@ define gb_Helper_make_url
 file://$(strip $(1))
 endef
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-
 gb_Helper_get_rcfile = $(1)rc
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 11aadc68547e..a1d4f8c7cce0 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -183,7 +183,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \
 		$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
 		$(if $(filter YES,$(LIBRARY_X64)), \
-			-LIBPATH:$(OUTDIR)/lib/x64 \
 			-LIBPATH:$(COMPATH)/lib/amd64 \
 			-LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
 		    $(if $(filter 80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64)) \
@@ -301,8 +300,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 
 $(call gb_Library_add_default_nativeres,$(1),$(1)/default)
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(notdir $(3)),$(3),$(1))
-
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile_in,$(2))
 
@@ -385,8 +382,6 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_DEFS := -D_DLL
-# cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin,
-# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
 gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(shell cygpath -w $(gb_Library_DLLDIR)):$(shell cygpath -w $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))"
 
 gb_CppunitTest_get_filename = test_$(1).dll
@@ -569,7 +564,7 @@ endef
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
-gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
+gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
 gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
 
 gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index b57dad02681b..cf0e43acab78 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -293,9 +293,7 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 
 # Helper class
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-
 # need windows path with backslashes here
-gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(OUTDIR)/bin);$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))"
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/filter-showIncludes.awk b/solenv/gbuild/platform/filter-showIncludes.awk
index 331be66bb974..06788a94d368 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -35,7 +35,7 @@ BEGIN {
     # to match especially drive letters in whitelist case insensitive
     IGNORECASE = 1
     whitelist = \
-        "^(" ENVIRON["SRCDIR"] "|" ENVIRON["OUTDIR"] "|" ENVIRON["WORKDIR"] ")"
+        "^(" ENVIRON["SRCDIR"] "|" ENVIRON["WORKDIR"] ")"
     firstline = 1
 }
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8ccec37640f8..a57530b53c7a 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -316,7 +316,7 @@ gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY
 ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER))
 gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_FOLDER)
 endif
-gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib:$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs
+gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs
 
 # Module class
 
@@ -380,7 +380,7 @@ $(call gb_UIMenubarTarget_get_target,$(1)) :| $(call gb_ExternalExecutable_get_d
 endef
 
 # Python
-gb_Python_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_Python_PRECOMMAND :=
 gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
 # this is passed to gdb as executable when running tests
 gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE)
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index fb00181a717e..53533e7f2f8f 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -225,8 +225,6 @@ gb_Library_ILIBEXT := .lib
 define gb_Library_Library_platform
 $(call gb_LinkTarget_set_ilibtarget,$(2),$(3))
 
-$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir
-
 $(call gb_LinkTarget_add_auxtargets,$(2), \
 	$(3) \
 	$(call gb_LinkTarget_get_mapfile,$(2)) \
@@ -382,6 +380,6 @@ endef
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
-gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
+gb_PYTHON_PRECOMMAND := $$(error FIXME)
 
 # vim: set noet sw=4: