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

Revert "superenv: fix cpp shim"

Browse Source 
This reverts commit dca89db55189a34f1c02d3f12a84eda8d81fd6d1.
This commit is contained in:
Misty De Meo 2013-08-27 18:31:57 -07:00
parent 55654933f5
commit a39ba39688
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/ENV/4.3/cc
View File

@ -6,7 +6,6 @@
#TODO create mechanism to specify build effects like %w{-O0 -O4 vanilla-arg-parsing sdk=10.6} etc. #TODO create mechanism to specify build effects like %w{-O0 -O4 vanilla-arg-parsing sdk=10.6} etc.
require "#{File.dirname __FILE__}/../libsuperenv" require "#{File.dirname __FILE__}/../libsuperenv"
require 'io/wait'
require 'set' require 'set'
def cccfg? flags def cccfg? flags
@ -56,7 +55,8 @@ class Cmd
def tool def tool
@tool ||= case @arg0 @tool ||= case @arg0
when 'ld' then 'ld' when 'ld' then 'ld'
when 'cc', 'cpp', 'c99', 'c89' when 'cpp' then 'cpp'
when 'cc', 'c99', 'c89'
# Ideally we would run `cx9`, however these tools are POSIX compliant # Ideally we would run `cx9`, however these tools are POSIX compliant
# and don't support many flags. We need -isystem for instance, but also # and don't support many flags. We need -isystem for instance, but also
# reliability is generally much higher if we just get clang/gcc to do # reliability is generally much higher if we just get clang/gcc to do
@ -90,8 +90,7 @@ class Cmd
end if nclt? end if nclt?
case mode case mode
when :cpp when :cpp
args = %w{-E} + args + cppflags %w{-E} + args + cppflags
STDIN.ready? ? args + %w{-} : args
when :ld when :ld
ldflags + args ldflags + args
when :cc when :cc