Make sure OTHER_CFLAGS and OTHER_LDFLAGS are inherited from the Xcode project so...

llvm-svn: 220720

diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj
index 689e860..df57701 100644 (file)
--- a/lldb/lldb.xcodeproj/project.pbxproj
+++ b/lldb/lldb.xcodeproj/project.pbxproj
@@ -5806,6 +5806,7 @@
                                        "$(OTHER_CFLAGS)",
                                );
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
                                        "-lllvmclang",
@@ -5821,6 +5822,7 @@
                                        ApplicationServices,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-framework",
                                        Foundation,
@@ -5870,6 +5872,7 @@
                                        "$(OTHER_CFLAGS)",
                                );
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
                                        "-lllvmclang",
@@ -5885,6 +5888,7 @@
                                        ApplicationServices,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-framework",
                                        Foundation,
@@ -6148,6 +6152,7 @@
                                INSTALL_PATH = "$(LLDB_TOOLS_INSTALL_DIR)";
                                LIBRARY_SEARCH_PATHS = "$(inherited)";
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(inherited)",
                                        "-sectcreate",
                                        __TEXT,
                                        __info_plist,
@@ -6155,6 +6160,7 @@
                                        "-Wl,-rpath,@loader_path/../../../System/Library/PrivateFrameworks",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "$(inherited)",
                                        "-sectcreate",
                                        __TEXT,
                                        __info_plist,
@@ -6211,6 +6217,7 @@
                                        "$(OTHER_CFLAGS)",
                                );
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
                                        "-lllvmclang",
@@ -6226,6 +6233,7 @@
                                        ApplicationServices,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-framework",
                                        Foundation,
@@ -6628,16 +6636,19 @@
                                );
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = (
+                                       "$(inherited)",
                                        "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CFLAGS[sdk=iphoneos*]" = (
+                                       "$(inherited)",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
@@ -6652,6 +6663,7 @@
                                        Security,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-lxml2",
                                        "-framework",
@@ -6696,16 +6708,19 @@
                                );
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = (
+                                       "$(inherited)",
                                        "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CFLAGS[sdk=iphoneos*]" = (
+                                       "$(inherited)",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
@@ -6720,6 +6735,7 @@
                                        Security,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-lxml2",
                                        "-framework",
@@ -6764,16 +6780,19 @@
                                );
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = (
+                                       "$(inherited)",
                                        "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CFLAGS[sdk=iphoneos*]" = (
+                                       "$(inherited)",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
@@ -6788,6 +6807,7 @@
                                        Security,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-lxml2",
                                        "-framework",
@@ -6818,6 +6838,7 @@
                                LIBRARY_SEARCH_PATHS = "$(inherited)";
                                LLVM_BUILD_DIR_ARCH = "$(OBJROOT)/llvm";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-sectcreate",
                                        __TEXT,
                                        __info_plist,
@@ -6845,6 +6866,7 @@
                                INSTALL_PATH = "$(LLDB_TOOLS_INSTALL_DIR)";
                                LIBRARY_SEARCH_PATHS = "$(inherited)";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-sectcreate",
                                        __TEXT,
                                        __info_plist,
@@ -6976,6 +6998,7 @@
                                LIBRARY_SEARCH_PATHS = "$(inherited)";
                                LLVM_BUILD_DIR_ARCH = "$(OBJROOT)/llvm";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-sectcreate",
                                        __TEXT,
                                        __info_plist,
@@ -7027,6 +7050,7 @@
                                        "$(OTHER_CFLAGS)",
                                );
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
                                        "-lllvmclang",
@@ -7042,6 +7066,7 @@
                                        ApplicationServices,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-framework",
                                        Foundation,
@@ -7136,16 +7161,19 @@
                                );
                                MACH_O_TYPE = mh_execute;
                                OTHER_CFLAGS = (
+                                       "$(inherited)",
                                        "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CFLAGS[sdk=iphoneos*]" = (
+                                       "$(inherited)",
                                        "-flimit-debug-info",
                                        "-Wparentheses",
                                );
                                "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = "$(OTHER_CFLAGS)";
                                OTHER_LDFLAGS = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
                                        "-lpython2.7",
@@ -7160,6 +7188,7 @@
                                        Security,
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+                                       "$(inherited)",
                                        "-lllvmclang",
                                        "-lxml2",
                                        "-framework",