diff --git a/config/software/bzip2.rb b/config/software/bzip2.rb
index aace5928672bc8dddf6d16499ad98f999b14b5ab_Y29uZmlnL3NvZnR3YXJlL2J6aXAyLnJi..47c679f41aa9a32e7e75b986addfd04f7d642506_Y29uZmlnL3NvZnR3YXJlL2J6aXAyLnJi 100644
--- a/config/software/bzip2.rb
+++ b/config/software/bzip2.rb
@@ -45,7 +45,6 @@
   args = "PREFIX='#{install_dir}/embedded' VERSION='#{version}'"
 
   patch source: 'makefile_take_env_vars.patch', env: env
-  patch source: 'soname_install_dir.patch', env: env if mac_os_x?
   patch source: 'CVE-2016-3189.patch', env: env
 
   make args.to_s, env: env
diff --git a/config/software/ncurses.rb b/config/software/ncurses.rb
index aace5928672bc8dddf6d16499ad98f999b14b5ab_Y29uZmlnL3NvZnR3YXJlL25jdXJzZXMucmI=..47c679f41aa9a32e7e75b986addfd04f7d642506_Y29uZmlnL3NvZnR3YXJlL25jdXJzZXMucmI= 100644
--- a/config/software/ncurses.rb
+++ b/config/software/ncurses.rb
@@ -53,17 +53,6 @@
     patch source: 'ncurses-5.9-gcc-5.patch', plevel: 1, env: env
   end
 
-  if mac_os_x?
-    # References:
-    # https://github.com/Homebrew/homebrew-dupes/issues/43
-    # http://invisible-island.net/ncurses/NEWS.html#t20110409
-    #
-    # Patches ncurses for clang compiler. Changes have been accepted into
-    # upstream, but occurred shortly after the 5.9 release. We should be able
-    # to remove this after upgrading to any release created after June 2012
-    patch source: 'ncurses-clang.patch'
-  end
-
   patch source: 'v5.9.ppc64le-configure.patch', plevel: 1 if version == '5.9' && ppc64le?
 
   update_config_guess
diff --git a/config/software/openssl.rb b/config/software/openssl.rb
index aace5928672bc8dddf6d16499ad98f999b14b5ab_Y29uZmlnL3NvZnR3YXJlL29wZW5zc2wucmI=..47c679f41aa9a32e7e75b986addfd04f7d642506_Y29uZmlnL3NvZnR3YXJlL29wZW5zc2wucmI= 100644
--- a/config/software/openssl.rb
+++ b/config/software/openssl.rb
@@ -47,24 +47,18 @@
     'shared',
   ]
 
-  configure_cmd =
-    if mac_os_x?
-      './Configure darwin64-x86_64-cc'
-    else
-      prefix =
-        if linux? && ppc64?
-          './Configure linux-ppc64'
-        elsif linux? && s390x?
-          # With gcc > 4.3 on s390x there is an error building
-          # with inline asm enabled
-          './Configure linux64-s390x -DOPENSSL_NO_INLINE_ASM'
-        elsif OhaiHelper.raspberry_pi?
-          './Configure linux-generic32'
-        else
-          './config'
-        end
-      "#{prefix} disable-gost"
-    end
+  prefix = if linux? && ppc64?
+             './Configure linux-ppc64'
+           elsif linux? && s390x?
+             # With gcc > 4.3 on s390x there is an error building
+             # with inline asm enabled
+             './Configure linux64-s390x -DOPENSSL_NO_INLINE_ASM'
+           elsif OhaiHelper.raspberry_pi?
+             './Configure linux-generic32'
+           else
+             './config'
+           end
+  configure_cmd = "#{prefix} disable-gost"
 
   # Out of abundance of caution, we put the feature flags first and then
   # the crazy platform specific compiler flags at the end.
diff --git a/config/software/ruby.rb b/config/software/ruby.rb
index aace5928672bc8dddf6d16499ad98f999b14b5ab_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI=..47c679f41aa9a32e7e75b986addfd04f7d642506_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI= 100644
--- a/config/software/ruby.rb
+++ b/config/software/ruby.rb
@@ -42,23 +42,12 @@
 
 env = with_standard_compiler_flags(with_embedded_path)
 
-if mac_os_x?
-  # -Qunused-arguments suppresses "argument unused during compilation"
-  # warnings. These can be produced if you compile a program that doesn't
-  # link to anything in a path given with -Lextra-libs. Normally these
-  # would be harmless, except that autoconf treats any output to stderr as
-  # a failure when it makes a test program to check your CFLAGS (regardless
-  # of the actual exit code from the compiler).
-  env['CFLAGS'] << " -I#{install_dir}/embedded/include/ncurses -arch x86_64 -m64 -O3 -g -pipe -Qunused-arguments"
-  env['LDFLAGS'] << ' -arch x86_64'
-else # including linux
-  env['CFLAGS'] << if version.satisfies?('>= 2.3.0') &&
-      rhel? && platform_version.satisfies?('< 6.0')
-                     ' -O2 -g -pipe'
-                   else
-                     ' -O3 -g -pipe'
-                   end
-end
+env['CFLAGS'] << if version.satisfies?('>= 2.3.0') &&
+    rhel? && platform_version.satisfies?('< 6.0')
+                   ' -O2 -g -pipe'
+                 else
+                   ' -O3 -g -pipe'
+                 end
 
 build do
   env['CFLAGS'] << ' -fno-omit-frame-pointer'
diff --git a/config/software/zlib.rb b/config/software/zlib.rb
index aace5928672bc8dddf6d16499ad98f999b14b5ab_Y29uZmlnL3NvZnR3YXJlL3psaWIucmI=..47c679f41aa9a32e7e75b986addfd04f7d642506_Y29uZmlnL3NvZnR3YXJlL3psaWIucmI= 100644
--- a/config/software/zlib.rb
+++ b/config/software/zlib.rb
@@ -25,10 +25,6 @@
 skip_transitive_dependency_licensing true
 
 build do
-  # We omit the omnibus path here because it breaks mac_os_x builds by picking
-  # up the embedded libtool instead of the system libtool which the zlib
-  # configure script cannot handle.
-  # TODO: Do other OSes need this?  Is this strictly a mac thing?
   env = with_standard_compiler_flags
 
   configure env: env