diff options
| author | samueljohn | 2012-07-07 15:10:01 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2012-07-09 09:36:25 -0700 |
| commit | e88c6828af9611b2707fcd3e27c5eb14580f7326 (patch) | |
| tree | cc00ff3207a9beb28f1ca84e9eade41bb05abc5c /Library | |
| parent | de5f6b7e9fbc1b43d056fca0528c6fa82f61ccdb (diff) | |
| download | homebrew-e88c6828af9611b2707fcd3e27c5eb14580f7326.tar.bz2 | |
ENV: remove -L from CFLAGS.
SDK/usr/include and lib now appended instead of prepended.
Prepending overwrote our precedence of HOMEBREW_PREFIX/include and lib.
Closes #13292.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 8bc759323..41ac3e5d6 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -238,7 +238,6 @@ Please take one of the following actions: remove 'CPPFLAGS', "-I#{sdk}/usr/include" remove_from_cflags "-isystem #{sdk}/usr/include" remove_from_cflags "-isysroot #{sdk}" - remove_from_cflags "-L#{sdk}/usr/lib" remove_from_cflags "-I#{sdk}/usr/include" remove 'LDFLAGS', "-L#{sdk}/usr/lib" remove 'LDFLAGS', "-I#{sdk}/usr/include" @@ -274,14 +273,11 @@ Please take one of the following actions: append_to_cflags "-isystem #{sdk}/usr/include" # Some software needs this (e.g. python shows error: /usr/include/zlib.h: No such file or directory) append 'CPPFLAGS', "-I#{sdk}/usr/include" - # Needed because CC passes this to the linker and some projects - # forget to use the LDFLAGS explicitly: - append_to_cflags "-L#{sdk}/usr/lib" # And finally the "normal" things one expects for the CFLAGS and LDFLAGS: append_to_cflags "-I#{sdk}/usr/include" - prepend 'LDFLAGS', "-L#{sdk}/usr/lib" - # Believe it or not, sometime only the LDFLAGS are used :/ - prepend 'LDFLAGS', "-I#{sdk}/usr/include" + append 'LDFLAGS', "-L#{sdk}/usr/lib" + # Believe it or not, sometimes only the LDFLAGS are used :/ + append 'LDFLAGS', "-I#{sdk}/usr/include" # Needed to build cmake itself and perhaps some cmake projects: append 'CMAKE_PREFIX_PATH', "#{sdk}/usr", ':' append 'CMAKE_FRAMEWORK_PATH', "#{sdk}/System/Library/Frameworks", ':' |