Modified: tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog (163494 => 163495)
--- tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 00:57:54 UTC (rev 163495)
@@ -1,5 +1,19 @@
2014-02-05 Lucas Forschler <[email protected]>
+ Merge r163474
+
+ 2014-02-05 Filip Pizlo <[email protected]>
+
+ JSC on Mac should pull LLVM from prefix=/usr/local/LLVMForJavaScriptCore and not /usr/local
+ https://bugs.webkit.org/show_bug.cgi?id=128269
+
+ Reviewed by Mark Hahnenberg.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/LLVMForJSC.xcconfig:
+
+2014-02-05 Lucas Forschler <[email protected]>
+
Merge r163473
2014-02-05 Mark Hahnenberg <[email protected]>
Modified: tags/Safari-538.16.2/Source/_javascript_Core/Configurations/Base.xcconfig (163494 => 163495)
--- tags/Safari-538.16.2/Source/_javascript_Core/Configurations/Base.xcconfig 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Source/_javascript_Core/Configurations/Base.xcconfig 2014-02-06 00:57:54 UTC (rev 163495)
@@ -78,7 +78,7 @@
LINKER_DISPLAYS_MANGLED_NAMES = YES;
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include" /usr/local/LLVMForJavaScriptCore/include "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
Modified: tags/Safari-538.16.2/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig (163494 => 163495)
--- tags/Safari-538.16.2/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-02-06 00:57:54 UTC (rev 163495)
@@ -29,7 +29,7 @@
OTHER_LDFLAGS_LLVM = $(OTHER_LDFLAGS_LLVM_$(ENABLE_FTL_JIT));
OTHER_LDFLAGS_LLVM_ = ;
-OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
+OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -L/usr/local/LLVMForJavaScriptCore/lib -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
Modified: tags/Safari-538.16.2/Tools/ChangeLog (163494 => 163495)
--- tags/Safari-538.16.2/Tools/ChangeLog 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Tools/ChangeLog 2014-02-06 00:57:54 UTC (rev 163495)
@@ -1,5 +1,18 @@
2014-02-05 Lucas Forschler <[email protected]>
+ Merge r163474
+
+ 2014-02-05 Filip Pizlo <[email protected]>
+
+ JSC on Mac should pull LLVM from prefix=/usr/local/LLVMForJavaScriptCore and not /usr/local
+ https://bugs.webkit.org/show_bug.cgi?id=128269
+
+ Reviewed by Mark Hahnenberg.
+
+ * Scripts/copy-webkitlibraries-to-product-directory:
+
+2014-02-05 Lucas Forschler <[email protected]>
+
Merge r163423
2014-02-04 Filip Pizlo <[email protected]>
Modified: tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory (163494 => 163495)
--- tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-06 00:57:54 UTC (rev 163495)
@@ -93,11 +93,9 @@
}
}
-if ($llvm || $wksi) {
+if ($wksi) {
(system("mkdir", "-p", "$productDir/usr/local/include") == 0) or die;
-}
-if ($wksi) {
my @librariesToCopy = (
"libWebKitSystemInterfaceLion.a",
"libWebKitSystemInterfaceMountainLion.a",
@@ -118,6 +116,8 @@
}
if ($llvm) {
+ (system("mkdir", "-p", "$productDir/usr/local/LLVMForJavaScriptCore/include") == 0) or die;
+
# Determine where to get LLVM binaries and headers.
my $majorDarwinVersion = (split /\./, `uname -r`)[0];
my $useOwnLLVM = 0;
@@ -230,15 +230,15 @@
}
if ($useOwnLLVM) {
- (system("rm", "-rf", "$productDir/usr/local/include/llvm") == 0) or die;
- (system("rm", "-rf", "$productDir/usr/local/include/llvm-c") == 0) or die;
- symlink("$ownLLVMDirectory/include/llvm", "$productDir/usr/local/include/llvm") or die;
- symlink("$ownLLVMDirectory/include/llvm-c", "$productDir/usr/local/include/llvm-c") or die;
+ (system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") == 0) or die;
+ (system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") == 0) or die;
+ symlink("$ownLLVMDirectory/include/llvm", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") or die;
+ symlink("$ownLLVMDirectory/include/llvm-c", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") or die;
} else {
- unpackIfNecessary("$productDir/usr/local/include", "$productDir/usr/local/include/llvm-c/Core.h", $llvmIncludePackage, 0);
+ unpackIfNecessary("$productDir/usr/local/LLVMForJavaScriptCore/include", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c/Core.h", $llvmIncludePackage, 0);
}
- my $llvmLibraryToken = "$productDir/usr/local/include/WebKitLLVMLibraryToken.h";
+ my $llvmLibraryToken = "$productDir/usr/local/LLVMForJavaScriptCore/include/WebKitLLVMLibraryToken.h";
if ($shouldUpdateLLVMLibraryToken || !-e $llvmLibraryToken) {
(open my $fileHandle, ">", $llvmLibraryToken) or die;
print {$fileHandle} "/* This file fools WebKit's build system into relinking _javascript_Core if the LLVM libraries changed. */\n";
