Merge pull request #9759 from chef/lcg/support-unbundled-rake

2 files changed, 7 insertions, 0 deletions

diff --git a/Rakefile b/Rakefile
index b54411af4c..a147fc3435 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+# we need this to resolve files required by lib/chef/dist
+$LOAD_PATH.unshift(File.expand_path("../chef-config/lib", __FILE__))
+
 begin
   require_relative "tasks/rspec"
   require_relative "tasks/dependencies"
@@ -27,6 +30,8 @@ rescue LoadError => e
   puts "Skipping missing rake dep: #{e}"
 end
 
+require "bundler/gem_helper"
+
 ENV["CHEF_LICENSE"] = "accept-no-persist"
 
 # hack the chef-config install to run before the traditional install task
diff --git a/chef-bin/Rakefile b/chef-bin/Rakefile
index 5626d1bc5d..5e5c9bbf5f 100644
--- a/chef-bin/Rakefile
+++ b/chef-bin/Rakefile
@@ -1,6 +1,8 @@
 # we need to force the install in order to overwrite the binstubs from
 # old chef gems.
 
+require "bundler/gem_helper"
+
 Bundler::GemHelper.install_tasks
 
 # this is necessary to use to overwrite any chef-14 or earlier era gem which has the bin files in