Remove LD_LIBRARY_PATH variable that nobody needs

Jacob Vosmaer
1 parent 3c45576c
Showing 1 changed file with 0 additions and 6 deletions Show diff stats
config/software/mysql-client.rb
@@ -36,12 +36,6 @@ env = {
   "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",
 }
-unless Ohai['platform'] =~ /ubuntu/ && Ohai['platform_version'] =~ /^14.04/
-  # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know
-  # is that it breaks the build on Ubuntu 14.04.
-  env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib")
-end
-
 # Force CentOS-5 to use gcc/g++ v4.4
 if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/
     env.merge!( {
	@@ -36,12 +36,6 @@ env = {		@@ -36,12 +36,6 @@ env = {
36	"PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",	36	"PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",
37	}	37	}
38		38
39	-unless Ohai['platform'] =~ /ubuntu/ && Ohai['platform_version'] =~ /^14.04/
40	- # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know
41	- # is that it breaks the build on Ubuntu 14.04.
42	- env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib")
43	-end
44	-
45	# Force CentOS-5 to use gcc/g++ v4.4	39	# Force CentOS-5 to use gcc/g++ v4.4
46	if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/	40	if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/
47	env.merge!( {	41	env.merge!( {