Changeset 112203 in webkit
- Timestamp:
- Mar 26, 2012 8:58:35 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r112201 r112203 1 2012-03-26 David Kilzer <ddkilzer@apple.com> 2 3 Build system prep work for upstreaming iOS changes 4 <http://webkit.org/b/82267> 5 6 Reviewed by Mark Rowe. 7 8 * DerivedSources.make: Move 'bison' into a variable and use 9 xcrun to find it on Mac OS X. 10 * bindings/scripts/preprocessor.pm: 11 (applyPreprocessor): Add local @args variable. On iOS, the 12 compiler needs additional "-isysroot $(SDKROOT)" arguments when 13 invoked, so it's easier to add them to an array, especially if 14 $SDKROOT contains a space in the path. Remove now-redundant 15 $gccLocation variable. 16 1 17 2012-03-26 Nate Chapin <japhet@chromium.org> 2 18 -
trunk/Source/WebCore/DerivedSources.make
r112035 r112203 729 729 # -------- 730 730 731 # Path to bison 732 733 ifeq ($(OS),MACOS) 734 BISON=$(shell xcrun -find bison) 735 else 736 BISON=bison 737 endif 738 739 # -------- 740 731 741 # CSS grammar 732 742 # NOTE: Older versions of bison do not inject an inclusion guard, so we add one. 733 743 734 744 CSSGrammar.cpp : css/CSSGrammar.y 735 bison-d -p cssyy $< -o $@745 $(BISON) -d -p cssyy $< -o $@ 736 746 touch CSSGrammar.cpp.h 737 747 touch CSSGrammar.hpp … … 748 758 749 759 XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE) 750 bison-d -p xpathyy $< -o $@760 $(BISON) -d -p xpathyy $< -o $@ 751 761 touch XPathGrammar.cpp.h 752 762 touch XPathGrammar.hpp -
trunk/Source/WebCore/bindings/scripts/preprocessor.pm
r101506 r112203 41 41 my $preprocessor = shift; 42 42 43 my @args = (); 43 44 if (!$preprocessor) { 44 45 require Config; 45 my $gccLocation = "";46 46 if ($ENV{CC}) { 47 $ gccLocation= $ENV{CC};47 $preprocessor = $ENV{CC}; 48 48 } elsif (($Config::Config{'osname'}) =~ /solaris/i) { 49 $ gccLocation= "/usr/sfw/bin/gcc";49 $preprocessor = "/usr/sfw/bin/gcc"; 50 50 } else { 51 $ gccLocation= "/usr/bin/gcc";51 $preprocessor = "/usr/bin/gcc"; 52 52 } 53 $preprocessor = $gccLocation . " -E -P -x c++";53 push(@args, qw(-E -P -x c++)); 54 54 } 55 55 … … 61 61 @macros = map { "-D$_" } @macros; 62 62 63 my $pid = open2(\*PP_OUT, \*PP_IN, split(' ', $preprocessor), @ macros, $fileName);63 my $pid = open2(\*PP_OUT, \*PP_IN, split(' ', $preprocessor), @args, @macros, $fileName); 64 64 close PP_IN; 65 65 my @documentContent = <PP_OUT>;
Note: See TracChangeset
for help on using the changeset viewer.