Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-05 07:32:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove the zlib CFLAGS and LDFLAGS settings from the xcode project file.

Browse Source 
We're linking against libcompression all the time now, we don't need to
fall back to zlib.  zlib support will still be used when lldb is built on
linux et al systems, so I'm not removing any of the source support, but
when built on darwin with xcode, we'll be using libcompression.

llvm-svn: 349572
This commit is contained in:
Jason Molenda 2018-12-18 23:33:42 +00:00
parent 5961809640
commit f00cf36290
1 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lldb/lldb.xcodeproj/project.pbxproj
View File

@ -8722,8 +8722,6 @@
LLDB_ENABLE_COVERAGE = 0; LLDB_ENABLE_COVERAGE = 0;
LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks; LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
LLDB_TOOLS_INSTALL_DIR = /usr/bin; LLDB_TOOLS_INSTALL_DIR = /usr/bin;
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)"; LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
LLVM_BUILD_DIRTREE = "$(SRCROOT)/llvm-build"; LLVM_BUILD_DIRTREE = "$(SRCROOT)/llvm-build";
LLVM_BUILD_DIR_ARCH = x86_64/; LLVM_BUILD_DIR_ARCH = x86_64/;
@ -8732,13 +8730,11 @@
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lcompression", "-lcompression",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)", "$(LLDB_COVERAGE_LDFLAGS)",
); );
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework/; PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework/;
@ -8810,8 +8806,6 @@
LLDB_ENABLE_COVERAGE = 0; LLDB_ENABLE_COVERAGE = 0;
LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks; LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
LLDB_TOOLS_INSTALL_DIR = /usr/bin; LLDB_TOOLS_INSTALL_DIR = /usr/bin;
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)"; LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
LLVM_BUILD_DIRTREE = "$(SRCROOT)/llvm-build"; LLVM_BUILD_DIRTREE = "$(SRCROOT)/llvm-build";
LLVM_BUILD_DIR_ARCH = x86_64/; LLVM_BUILD_DIR_ARCH = x86_64/;
@ -8820,13 +8814,11 @@
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lcompression", "-lcompression",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)", "$(LLDB_COVERAGE_LDFLAGS)",
); );
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework/; PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework/;
@ -8960,7 +8952,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9001,7 +8992,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9042,7 +9032,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9083,7 +9072,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9124,7 +9112,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9143,7 +9130,6 @@
"-framework", "-framework",
ApplicationServices, ApplicationServices,
"$(LLDB_GTESTS_LDFLAGS)", "$(LLDB_GTESTS_LDFLAGS)",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)", "$(LLDB_COMPRESSION_LDFLAGS)",
); );
PRODUCT_NAME = "lldb-gtest"; PRODUCT_NAME = "lldb-gtest";
@ -9167,7 +9153,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9186,7 +9171,6 @@
"-framework", "-framework",
ApplicationServices, ApplicationServices,
"$(LLDB_GTESTS_LDFLAGS)", "$(LLDB_GTESTS_LDFLAGS)",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)", "$(LLDB_COMPRESSION_LDFLAGS)",
); );
PRODUCT_NAME = "lldb-gtest"; PRODUCT_NAME = "lldb-gtest";
@ -9210,7 +9194,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9229,7 +9212,6 @@
"-framework", "-framework",
ApplicationServices, ApplicationServices,
"$(LLDB_GTESTS_LDFLAGS)", "$(LLDB_GTESTS_LDFLAGS)",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)", "$(LLDB_COMPRESSION_LDFLAGS)",
); );
PRODUCT_NAME = "lldb-gtest"; PRODUCT_NAME = "lldb-gtest";
@ -9253,7 +9235,6 @@
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-fno-rtti", "-fno-rtti",
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_GTESTS_CFLAGS)", "$(LLDB_GTESTS_CFLAGS)",
"-DGTEST_HAS_RTTI=0", "-DGTEST_HAS_RTTI=0",
); );
@ -9272,7 +9253,6 @@
"-framework", "-framework",
ApplicationServices, ApplicationServices,
"$(LLDB_GTESTS_LDFLAGS)", "$(LLDB_GTESTS_LDFLAGS)",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)", "$(LLDB_COMPRESSION_LDFLAGS)",
); );
PRODUCT_NAME = "lldb-gtest"; PRODUCT_NAME = "lldb-gtest";
@ -9346,8 +9326,6 @@
"$(inherited)", "$(inherited)",
); );
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-fno-rtti", "-fno-rtti",
@ -9416,8 +9394,6 @@
"$(inherited)", "$(inherited)",
); );
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-fno-rtti", "-fno-rtti",
@ -9748,8 +9724,6 @@
); );
HEADER_SEARCH_PATHS = /usr/include/libxml2; HEADER_SEARCH_PATHS = /usr/include/libxml2;
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
@ -9802,8 +9776,6 @@
); );
HEADER_SEARCH_PATHS = /usr/include/libxml2; HEADER_SEARCH_PATHS = /usr/include/libxml2;
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
@ -9856,8 +9828,6 @@
); );
HEADER_SEARCH_PATHS = /usr/include/libxml2; HEADER_SEARCH_PATHS = /usr/include/libxml2;
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
@ -9943,8 +9913,6 @@
"LLDB_FRAMEWORK_INSTALL_DIR[sdk=iphoneos*]" = /System/Library/PrivateFrameworks; "LLDB_FRAMEWORK_INSTALL_DIR[sdk=iphoneos*]" = /System/Library/PrivateFrameworks;
LLDB_TOOLS_INSTALL_DIR = /Applications/Xcode.app/Contents/Developer/usr/bin; LLDB_TOOLS_INSTALL_DIR = /Applications/Xcode.app/Contents/Developer/usr/bin;
"LLDB_TOOLS_INSTALL_DIR[sdk=iphoneos*]" = /usr/local/bin; "LLDB_TOOLS_INSTALL_DIR[sdk=iphoneos*]" = /usr/local/bin;
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
LLVM_BUILD_DIR = "$(OBJROOT)/llvm"; LLVM_BUILD_DIR = "$(OBJROOT)/llvm";
LLVM_BUILD_DIRTREE = "$(OBJROOT)/llvm-build"; LLVM_BUILD_DIRTREE = "$(OBJROOT)/llvm-build";
LLVM_BUILD_DIR_ARCH = x86_64/; LLVM_BUILD_DIR_ARCH = x86_64/;
@ -9952,14 +9920,12 @@
LLVM_SOURCE_DIR = "$(SRCROOT)/llvm"; LLVM_SOURCE_DIR = "$(SRCROOT)/llvm";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
"-DNDEBUG", "-DNDEBUG",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lcompression", "-lcompression",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)", "$(LLDB_COVERAGE_LDFLAGS)",
); );
"OTHER_LDFLAGS[sdk=macosx*]" = ""; "OTHER_LDFLAGS[sdk=macosx*]" = "";
@ -9990,7 +9956,6 @@
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
"-fno-rtti", "-fno-rtti",
@ -10060,8 +10025,6 @@
"$(inherited)", "$(inherited)",
); );
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-fno-rtti", "-fno-rtti",
@ -10564,7 +10527,6 @@
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
"-fno-rtti", "-fno-rtti",
@ -10604,7 +10566,6 @@
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
"-fno-rtti", "-fno-rtti",
@ -10688,8 +10649,6 @@
LLDB_ENABLE_COVERAGE = 0; LLDB_ENABLE_COVERAGE = 0;
LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks; LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
LLDB_TOOLS_INSTALL_DIR = /usr/bin; LLDB_TOOLS_INSTALL_DIR = /usr/bin;
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)"; LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
LLVM_BUILD_DIRTREE = "$(SRCROOT)/llvm-build"; LLVM_BUILD_DIRTREE = "$(SRCROOT)/llvm-build";
LLVM_BUILD_DIR_ARCH = x86_64/; LLVM_BUILD_DIR_ARCH = x86_64/;
@ -10698,13 +10657,11 @@
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lcompression", "-lcompression",
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)", "$(LLDB_COVERAGE_LDFLAGS)",
); );
PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework/; PYTHON_FRAMEWORK_PATH = /System/Library/Frameworks/Python.framework/;
@ -10759,7 +10716,6 @@
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-Wparentheses", "-Wparentheses",
"$(LLDB_ZLIB_CFLAGS)",
"$(LLDB_COVERAGE_CFLAGS)", "$(LLDB_COVERAGE_CFLAGS)",
"-Wimplicit-fallthrough", "-Wimplicit-fallthrough",
"-fno-rtti", "-fno-rtti",
@ -10811,8 +10767,6 @@
"$(inherited)", "$(inherited)",
); );
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
"-fno-rtti", "-fno-rtti",
@ -10894,8 +10848,6 @@
); );
HEADER_SEARCH_PATHS = /usr/include/libxml2; HEADER_SEARCH_PATHS = /usr/include/libxml2;
LLDB_COMPRESSION_LDFLAGS = "-lcompression"; LLDB_COMPRESSION_LDFLAGS = "-lcompression";
LLDB_ZLIB_CFLAGS = "-DHAVE_LIBZ=1";
LLDB_ZLIB_LDFLAGS = "-lz";
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",