Author: jmolenda
Date: Tue Jan 31 22:23:15 2017
New Revision: 293742

URL: http://llvm.org/viewvc/llvm-project?rev=293742&view=rev
Log:
When I added the use of the new compression framework (present in
Mac OS X 10.11, El Capitan, released c. Oct 2015) I conditionalized
the use of the framework on "if sdk == macosx 10.11".  But since
macOS 10.12 has shipped this year, the framework was no longer being
built in.  I can either start listing every OS 10.11 and newer, or
remove the version check.

This will break building lldb with xcodebuild / Xcode for people 
running Mac OS X 10.10 or older.  If so, I'll back this change out.
I'm not sure if we have many people working on macs running the
older OSes on their build systems.

<rdar://problem/30159130> 

Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=293742&r1=293741&r2=293742&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Jan 31 22:23:15 2017
@@ -7919,10 +7919,8 @@
                                GCC_WARN_UNUSED_LABEL = YES;
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               LLDB_COMPRESSION_CFLAGS = "";
-                               "LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11]" = 
"-DHAVE_LIBCOMPRESSION=1";
-                               LLDB_COMPRESSION_LDFLAGS = "";
-                               "LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = 
"-weak-lcompression";
+                               LLDB_COMPRESSION_CFLAGS = 
"-DHAVE_LIBCOMPRESSION=1";
+                               LLDB_COMPRESSION_LDFLAGS = "-weak-lcompression";
                                LLDB_COVERAGE_CFLAGS = 
"$(LLDB_COVERAGE_CFLAGS_$(LLDB_ENABLE_COVERAGE))";
                                LLDB_COVERAGE_CFLAGS_1 = 
"-fprofile-instr-generate -fcoverage-mapping";
                                LLDB_COVERAGE_LDFLAGS = 
"$(LLDB_COVERAGE_LDFLAGS_$(LLDB_ENABLE_COVERAGE))";
@@ -8012,10 +8010,8 @@
                                GCC_WARN_UNUSED_LABEL = YES;
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               LLDB_COMPRESSION_CFLAGS = "";
-                               "LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11]" = 
"-DHAVE_LIBCOMPRESSION=1";
-                               LLDB_COMPRESSION_LDFLAGS = "";
-                               "LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = 
"-weak-lcompression";
+                               LLDB_COMPRESSION_CFLAGS = 
"-DHAVE_LIBCOMPRESSION=1";
+                               LLDB_COMPRESSION_LDFLAGS = "-weak-lcompression";
                                LLDB_COVERAGE_CFLAGS = 
"$(LLDB_COVERAGE_CFLAGS_$(LLDB_ENABLE_COVERAGE))";
                                LLDB_COVERAGE_CFLAGS_1 = 
"-fprofile-instr-generate -fcoverage-mapping";
                                LLDB_COVERAGE_LDFLAGS = 
"$(LLDB_COVERAGE_LDFLAGS_$(LLDB_ENABLE_COVERAGE))";
@@ -8966,10 +8962,8 @@
                                GCC_WARN_UNUSED_LABEL = YES;
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               LLDB_COMPRESSION_CFLAGS = "";
-                               "LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11]" = 
"-DHAVE_LIBCOMPRESSION=1";
-                               LLDB_COMPRESSION_LDFLAGS = "";
-                               "LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = 
"-weak-lcompression";
+                               LLDB_COMPRESSION_CFLAGS = 
"-DHAVE_LIBCOMPRESSION=1";
+                               LLDB_COMPRESSION_LDFLAGS = "-weak-lcompression";
                                LLDB_COVERAGE_CFLAGS = 
"$(LLDB_COVERAGE_CFLAGS_$(LLDB_ENABLE_COVERAGE))";
                                LLDB_COVERAGE_CFLAGS_1 = 
"-fprofile-instr-generate -fcoverage-mapping";
                                LLDB_COVERAGE_LDFLAGS = 
"$(LLDB_COVERAGE_LDFLAGS_$(LLDB_ENABLE_COVERAGE))";
@@ -9685,10 +9679,8 @@
                                GCC_WARN_UNUSED_LABEL = YES;
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               LLDB_COMPRESSION_CFLAGS = "";
-                               
"LLDB_COMPRESSION_CFLAGS[sdk=macosx10.11internal]" = "-DHAVE_LIBCOMPRESSION=1";
-                               LLDB_COMPRESSION_LDFLAGS = "";
-                               "LLDB_COMPRESSION_LDFLAGS[sdk=macosx10.11]" = 
"-weak-lcompression";
+                               LLDB_COMPRESSION_CFLAGS = 
"-DHAVE_LIBCOMPRESSION=1";
+                               LLDB_COMPRESSION_LDFLAGS = "-weak-lcompression";
                                LLDB_COVERAGE_CFLAGS = 
"$(LLDB_COVERAGE_CFLAGS_$(LLDB_ENABLE_COVERAGE))";
                                LLDB_COVERAGE_CFLAGS_1 = 
"-fprofile-instr-generate -fcoverage-mapping";
                                LLDB_COVERAGE_LDFLAGS = 
"$(LLDB_COVERAGE_LDFLAGS_$(LLDB_ENABLE_COVERAGE))";


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to