Changeset 104835 in webkit
- Timestamp:
- Jan 12, 2012 10:20:05 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r104834 r104835 1 2012-01-12 Dan Bernstein <mitz@apple.com> 2 3 When generating derived sources, use the same compiler that is used to compile WebCore. 4 5 Fixes <http://webkit.org/b/76189> 6 [mac] When compiling WebCore with clang, llvm-gcc is used to generate derived sources 7 8 Reviewed by Mark Rowe. 9 10 * DerivedSources.make: Changed to use the CC environment variable instead of hardcoded gcc. 11 * WebCore.xcodeproj/project.pbxproj: Set the CC environment variable, if not already set, 12 according to TARGET_GCC_VERSION. CC is used by DerivedSources.make and some of the perl 13 scripts it invokes. 14 1 15 2012-01-12 Pierre Rossi <pierre.rossi@gmail.com> 2 16 -
trunk/Source/WebCore/DerivedSources.make
r104654 r104835 624 624 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));') 625 625 626 ifeq ($(shell gcc-E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_DASHBOARD_SUPPORT | cut -d' ' -f3), 1)626 ifeq ($(shell $(CC) -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_DASHBOARD_SUPPORT | cut -d' ' -f3), 1) 627 627 ENABLE_DASHBOARD_SUPPORT = 1 628 628 else … … 630 630 endif 631 631 632 ifeq ($(shell gcc-E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)632 ifeq ($(shell $(CC) -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1) 633 633 ENABLE_ORIENTATION_EVENTS = 1 634 634 else -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r104827 r104835 25261 25261 runOnlyForDeploymentPostprocessing = 0; 25262 25262 shellPath = /bin/sh; 25263 shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";25263 shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ ! $CC ]; then\n case $TARGET_GCC_VERSION in\n (GCC_42)\n export CC=\"${DT_TOOLCHAIN_DIR}/usr/bin/gcc-4.2\";;\n (LLVM_GCC_42)\n export CC=\"${DT_TOOLCHAIN_DIR}/usr/bin/llvm-gcc-4.2\";;\n (LLVM_COMPILER)\n export CC=\"${DT_TOOLCHAIN_DIR}/usr/bin/clang\";;\n esac\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n"; 25264 25264 }; 25265 25265 /* End PBXShellScriptBuildPhase section */
Note: See TracChangeset
for help on using the changeset viewer.