8 Commits

Author SHA1 Message Date
Jack Nagel
c84f7d0ab2 Revert "Revert "Split bsdmake wrapper out from make wrapper""
I think enough time has passed that it is safe to do this now.

This reverts commit 1003161a848970e782633959904ea776dda7e48b.
2013-12-04 00:37:57 -06:00
Jack Nagel
6163c2a98e Revert "Split bsdmake wrapper out from make wrapper"
This reverts commit ba7ec6eb2f650ebc5a0ae09547eea423dbd45173.

Temporarily mitigate bug fixed in 1153d0f9e20d0b6a19203707b609634f8fea1ad5.
2013-11-14 09:48:20 -06:00
Jack Nagel
5a56ad123d Split bsdmake wrapper out from make wrapper 2013-11-13 22:26:07 -06:00
Adam Vandenberg
a5e969dfb5 superenv: make HOMEBREW_FILE available
Superenv scripts have a stripped PATH, which may not include
the brew binary itself. Make this explicitly available to
superenv scripts.

Fixes bsdmake wrapper.

Closes Homebrew/homebrew#16805.
Closes Homebrew/homebrew#16846.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2013-01-03 09:14:36 -08:00
Max Howell
ffc6423d73 Look harder for bsdmake
bsdmake used to be keg-only, so some users still have it unlinked (presumably they never run brew-doctor). Even though there is code to abort if dependencies are unlinked, it appears broken for this case. So let's just be thorough anyway.

Closes Homebrew/homebrew#14751.
2012-09-13 11:28:31 -04:00
Max Howell
c35f6cb9d5 Set CC and CXX with superenv (again)
It was dumb to have make call different compilers to configure depending on the `servile?` flag. This is not a route to reliability.

Instead now we set CC (formula that break if CC is set like Jack be damned, their build-systems are just plain broken and should not be supported). When cc is called we examine HOMEBREW_CC, otherwise we instantiate the tool that was called, just like the formula's build-system will expect.

Fixes Homebrew/homebrew#14659 (though the build fails later for me, with the same error for stdenv and superenv).
2012-09-03 15:12:31 -04:00
Max Howell
c36f79c79a bsdmake is *not* provided by Xcode/CLT
Fixes Homebrew/homebrew#14626.

Also make proctools install do prefixes other than /usr/local.
2012-09-02 11:22:12 -04:00
Max Howell
d4503b1202 Fixes Homebrew/homebrew#14542; ocaml superenv issues
This patch removes most of the settings for CC, CXX etc. because we are trying to be minimal. Then we force the compiler to Homebrew's choice underneath in superenv. We however leave LD because we prefer that build-systems use the c-compiler for linking, it generally works better (copiously tested), however when the build-system explicitly calls ld, we respect that. This gets around the ocaml bug in question, since somehow clang was crashing during link, but the ld tool itself (which is kind of clang, kind of llvm-gcc) is okay with this.

Also moved the setting of O (so that cc-args are refurbished) into a make wrapper. Not sure if this matter much, but seems more consistent.
2012-08-30 20:02:29 -04:00