Title: [154557] trunk/Source/_javascript_Core
- Revision
- 154557
- Author
- [email protected]
- Date
- 2013-08-24 18:53:55 -0700 (Sat, 24 Aug 2013)
Log Message
[mac] link against libz in a more civilized manner
https://bugs.webkit.org/show_bug.cgi?id=120258
Reviewed by Darin Adler.
* Configurations/_javascript_Core.xcconfig: Removed “-lz” from OTHER_LDFLAGS_BASE.
* _javascript_Core.xcodeproj/project.pbxproj: Added libz.dylib to the _javascript_Core target’s
Link Binary With Libraries build phase.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (154556 => 154557)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-25 00:07:47 UTC (rev 154556)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-25 01:53:55 UTC (rev 154557)
@@ -1,3 +1,14 @@
+2013-08-24 Dan Bernstein <[email protected]>
+
+ [mac] link against libz in a more civilized manner
+ https://bugs.webkit.org/show_bug.cgi?id=120258
+
+ Reviewed by Darin Adler.
+
+ * Configurations/_javascript_Core.xcconfig: Removed “-lz” from OTHER_LDFLAGS_BASE.
+ * _javascript_Core.xcodeproj/project.pbxproj: Added libz.dylib to the _javascript_Core target’s
+ Link Binary With Libraries build phase.
+
2013-08-23 Laszlo Papp <[email protected]>
Failure building with python3
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (154556 => 154557)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2013-08-25 00:07:47 UTC (rev 154556)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2013-08-25 01:53:55 UTC (rev 154557)
@@ -39,9 +39,7 @@
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_BASE = -lz -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
+OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (154556 => 154557)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-08-25 00:07:47 UTC (rev 154556)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-08-25 01:53:55 UTC (rev 154557)
@@ -628,6 +628,7 @@
2600B5A6152BAAA70091EE5F /* JSStringJoiner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */; };
2600B5A7152BAAA70091EE5F /* JSStringJoiner.h in Headers */ = {isa = PBXBuildFile; fileRef = 2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */; };
2A48D1911772365B00C65A5F /* APICallbackFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = C211B574176A224D000E2A23 /* APICallbackFunction.h */; };
+ 371D842D17C98B6E00ECF994 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 371D842C17C98B6E00ECF994 /* libz.dylib */; };
41359CF30FDD89AD00206180 /* DateConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = D21202290AD4310C00ED79B6 /* DateConversion.h */; };
4443AE3316E188D90076F110 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
451539B912DC994500EF7AC4 /* Yarr.h in Headers */ = {isa = PBXBuildFile; fileRef = 451539B812DC994500EF7AC4 /* Yarr.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1736,6 +1737,7 @@
1CAA8B4B0D32C39A0041BCFF /* _javascript_Core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _javascript_Core.h; sourceTree = "<group>"; };
2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringJoiner.cpp; sourceTree = "<group>"; };
2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringJoiner.h; sourceTree = "<group>"; };
+ 371D842C17C98B6E00ECF994 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
449097EE0F8F81B50076A327 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
451539B812DC994500EF7AC4 /* Yarr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Yarr.h; path = yarr/Yarr.h; sourceTree = "<group>"; };
45E12D8806A49B0F00E9DF84 /* jsc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsc.cpp; sourceTree = "<group>"; tabWidth = 4; };
@@ -2328,6 +2330,7 @@
932F5BD70822A1C700736975 /* libicucore.dylib in Frameworks */,
932F5BD60822A1C700736975 /* libobjc.dylib in Frameworks */,
A8A4748E151A8306004123FF /* libWTF.a in Frameworks */,
+ 371D842D17C98B6E00ECF994 /* libz.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2405,6 +2408,7 @@
9322A00306C341D3009067BB /* libicucore.dylib */,
51F0EC0705C86C9A00E6DF1B /* libobjc.dylib */,
A8A4748D151A8306004123FF /* libWTF.a */,
+ 371D842C17C98B6E00ECF994 /* libz.dylib */,
);
name = Frameworks;
sourceTree = "<group>";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
