aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-05-15 13:45:50 -0500
committerJack Nagel2014-05-15 13:46:10 -0500
commit1fd1c1723f164afcc3bf2b3a8786d970359001b0 (patch)
tree649a5774716cef5c1097a8b289c8bde953e35b71
parenta17d4f59d3cd8275dbbd37b86ab127452d92ddac (diff)
downloadhomebrew-1fd1c1723f164afcc3bf2b3a8786d970359001b0.tar.bz2
Don't assume cflags is non-nil
Fixes #29284.
-rw-r--r--Library/Formula/fftw.rb2
-rw-r--r--Library/Formula/glib.rb2
-rw-r--r--Library/Formula/hidapi.rb2
-rw-r--r--Library/Formula/libcapn.rb2
-rw-r--r--Library/Formula/libffi.rb2
-rw-r--r--Library/Formula/liboil.rb2
-rw-r--r--Library/Formula/sqlite.rb2
7 files changed, 7 insertions, 7 deletions
diff --git a/Library/Formula/fftw.rb b/Library/Formula/fftw.rb
index 2b908e1e6..1268b0fc4 100644
--- a/Library/Formula/fftw.rb
+++ b/Library/Formula/fftw.rb
@@ -73,7 +73,7 @@ class Fftw < Formula
}
TEST_SCRIPT
- system ENV.cc, '-o', 'fftw', 'fftw.c', '-lfftw3', *ENV.cflags.split
+ system ENV.cc, '-o', 'fftw', 'fftw.c', '-lfftw3', *ENV.cflags.to_s.split
system './fftw'
end
end
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 8b072f8c4..34c840e66 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -114,7 +114,7 @@ class Glib < Formula
}
EOS
flags = ["-I#{include}/glib-2.0", "-I#{lib}/glib-2.0/include", "-lglib-2.0"]
- system ENV.cc, "-o", "test", "test.c", *(flags + ENV.cflags.split)
+ system ENV.cc, "-o", "test", "test.c", *(flags + ENV.cflags.to_s.split)
system "./test"
end
end
diff --git a/Library/Formula/hidapi.rb b/Library/Formula/hidapi.rb
index 21e257474..e97a739d9 100644
--- a/Library/Formula/hidapi.rb
+++ b/Library/Formula/hidapi.rb
@@ -25,7 +25,7 @@ class Hidapi < Formula
}
EOS
- flags = `pkg-config --cflags --libs hidapi`.split + ENV.cflags.split
+ flags = `pkg-config --cflags --libs hidapi`.split + ENV.cflags.to_s.split
system ENV.cc, "-o", "test", "test.c", *flags
system './test'
end
diff --git a/Library/Formula/libcapn.rb b/Library/Formula/libcapn.rb
index e0199c7b4..e5d3a3931 100644
--- a/Library/Formula/libcapn.rb
+++ b/Library/Formula/libcapn.rb
@@ -30,7 +30,7 @@ class Libcapn < Formula
return 0;
}
TEST_SCRIPT
- flags = `#{HOMEBREW_PREFIX}/bin/pkg-config --cflags --libs libcapn`.split + ENV.cflags.split
+ flags = `#{HOMEBREW_PREFIX}/bin/pkg-config --cflags --libs libcapn`.split + ENV.cflags.to_s.split
system ENV.cc, "-o", "test_install", "test_install.c", *flags
system "./test_install"
end
diff --git a/Library/Formula/libffi.rb b/Library/Formula/libffi.rb
index d1cfaefb0..f1e62d696 100644
--- a/Library/Formula/libffi.rb
+++ b/Library/Formula/libffi.rb
@@ -74,7 +74,7 @@ class Libffi < Formula
TEST_SCRIPT
flags = ["-L#{lib}", "-lffi", "-I#{lib}/libffi-#{version}/include"]
- system ENV.cc, "-o", "closure", "closure.c", *(flags + ENV.cflags.split)
+ system ENV.cc, "-o", "closure", "closure.c", *(flags + ENV.cflags.to_s.split)
system "./closure"
end
end
diff --git a/Library/Formula/liboil.rb b/Library/Formula/liboil.rb
index 8a5253e46..f81ff3409 100644
--- a/Library/Formula/liboil.rb
+++ b/Library/Formula/liboil.rb
@@ -33,7 +33,7 @@ class Liboil < Formula
return 0;
}
EOS
- flags = `#{HOMEBREW_PREFIX}/bin/pkg-config --cflags --libs liboil-0.3`.split + ENV.cflags.split
+ flags = `#{HOMEBREW_PREFIX}/bin/pkg-config --cflags --libs liboil-0.3`.split + ENV.cflags.to_s.split
system ENV.cc, "test.c", "-o", "test", *flags
system "./test"
end
diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index ff2f3d9fe..73a2604b9 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -51,7 +51,7 @@ class Sqlite < Formula
"-dynamiclib",
"extension-functions.c",
"-o", "libsqlitefunctions.dylib",
- *ENV.cflags.split
+ *ENV.cflags.to_s.split
lib.install "libsqlitefunctions.dylib"
end
doc.install resource('docs') if build.with? "docs"