Remove custom LDFLAGS and CFLAGS for osx.

OSX 10.5 or greater can use '-Wl,-rpath,/path/to/lib' so we can use the default flags. Signed-off-by: Jon Morrow <[email protected]>
chef · Feb 25, 2019 · 2a1e68f · 2a1e68f
1 parent bf00680
commit 2a1e68f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/lib/omnibus/software.rb b/lib/omnibus/software.rb
@@ -665,11 +665,6 @@ def with_standard_compiler_flags(env = {}, opts = {})
             "OBJECT_MODE" => "64",
             "ARFLAGS" => "-X64 cru",
           }
-        when "mac_os_x"
-          {
-            "LDFLAGS" => "-L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
-          }
         when "solaris2"
           if platform_version.satisfies?("<= 5.10")
             solaris_flags = {

diff --git a/spec/unit/software_spec.rb b/spec/unit/software_spec.rb
@@ -195,7 +195,7 @@ module Omnibus
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
-            "LDFLAGS"         => "-L/opt/project/embedded/lib",
+            "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
             "CFLAGS"          => "-I/opt/project/embedded/include -O2",
             "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
             "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",