admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

ENV: remove -L from CFLAGS.

Browse Source 
SDK/usr/include and lib now appended instead of prepended.
Prepending overwrote our precedence of HOMEBREW_PREFIX/include and lib.

Closes Homebrew/homebrew#13292.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
samueljohn 2012-07-07 15:10:01 +02:00 committed by Adam Vandenberg
parent 50b2a32f9a
commit dd9ef7b71b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/extend/ENV.rb
View File

@ -238,7 +238,6 @@ Please take one of the following actions:
remove 'CPPFLAGS', "-I#{sdk}/usr/include" remove 'CPPFLAGS', "-I#{sdk}/usr/include"
remove_from_cflags "-isystem #{sdk}/usr/include" remove_from_cflags "-isystem #{sdk}/usr/include"
remove_from_cflags "-isysroot #{sdk}" remove_from_cflags "-isysroot #{sdk}"
remove_from_cflags "-L#{sdk}/usr/lib"
remove_from_cflags "-I#{sdk}/usr/include" remove_from_cflags "-I#{sdk}/usr/include"
remove 'LDFLAGS', "-L#{sdk}/usr/lib" remove 'LDFLAGS', "-L#{sdk}/usr/lib"
remove 'LDFLAGS', "-I#{sdk}/usr/include" remove 'LDFLAGS', "-I#{sdk}/usr/include"
@ -274,14 +273,11 @@ Please take one of the following actions:
append_to_cflags "-isystem #{sdk}/usr/include" 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) # Some software needs this (e.g. python shows error: /usr/include/zlib.h: No such file or directory)
append 'CPPFLAGS', "-I#{sdk}/usr/include" 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: # And finally the "normal" things one expects for the CFLAGS and LDFLAGS:
append_to_cflags "-I#{sdk}/usr/include" append_to_cflags "-I#{sdk}/usr/include"
prepend 'LDFLAGS', "-L#{sdk}/usr/lib" append 'LDFLAGS', "-L#{sdk}/usr/lib"
# Believe it or not, sometime only the LDFLAGS are used :/ # Believe it or not, sometimes only the LDFLAGS are used :/
prepend 'LDFLAGS', "-I#{sdk}/usr/include" append 'LDFLAGS', "-I#{sdk}/usr/include"
# Needed to build cmake itself and perhaps some cmake projects: # Needed to build cmake itself and perhaps some cmake projects:
append 'CMAKE_PREFIX_PATH', "#{sdk}/usr", ':' append 'CMAKE_PREFIX_PATH', "#{sdk}/usr", ':'
append 'CMAKE_FRAMEWORK_PATH', "#{sdk}/System/Library/Frameworks", ':' append 'CMAKE_FRAMEWORK_PATH', "#{sdk}/System/Library/Frameworks", ':'