Author: jmolenda
Date: Tue Jul 17 16:44:09 2018
New Revision: 337335
URL: http://llvm.org/viewvc/llvm-project?rev=337335&view=rev
Log:
Link the lldb driver ("lldb") against the llvm static
libraries because of the new prettystackprinter dependency.
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=337335&r1=337334&r2=337335&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Jul 17 16:44:09 2018
@@ -7285,7 +7285,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd
\"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nfor file in
*.h\ndo\n\t/usr/bin/sed -i '' 's/\\(#include\\)[
]*\"lldb\\/\\(API\\/\\)\\{0,1\\}\\(.*\\)\"/\\1 <LLDB\\/\\3>/1'
\"$file\"\n\t/usr/bin/sed -i '' 's|<LLDB/Utility|<LLDB|'
\"$file\"\n\tLLDB_VERSION=`echo ${CURRENT_PROJECT_VERSION} | /usr/bin/sed -E
's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\1/g'`\n LLDB_REVISION=`echo
${CURRENT_PROJECT_VERSION} | /usr/bin/sed -E
's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\3/g'`\n
LLDB_VERSION_STRING=`echo ${CURRENT_PROJECT_VERSION}`\n\t/usr/bin/sed -i ''
\"s|//#define LLDB_VERSION$|#define LLDB_VERSION $LLDB_VERSION |\" \"$file\"\n
/usr/bin/sed -i '' \"s|//#define LLDB_REVISION|#define LLDB_REVISION
$LLDB_REVISION |\" \"$file\"\n /usr/bin/sed -i '' \"s|//#define
LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \\\"$LLDB_VERSION_STRING\\\"
|\" \"$file\"\ndone\n";
+ shellScript = "cd
\"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nfor file in *.h\ndo\n
/usr/bin/sed -i '' 's/\\(#include\\)[
]*\"lldb\\/\\(API\\/\\)\\{0,1\\}\\(.*\\)\"/\\1 <LLDB\\/\\3>/1' \"$file\"\n
/usr/bin/sed -i '' 's|<LLDB/Utility|<LLDB|' \"$file\"\n LLDB_VERSION=`echo
${CURRENT_PROJECT_VERSION} | /usr/bin/sed -E
's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\1/g'`\n LLDB_REVISION=`echo
${CURRENT_PROJECT_VERSION} | /usr/bin/sed -E
's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\3/g'`\n
LLDB_VERSION_STRING=`echo ${CURRENT_PROJECT_VERSION}`\n /usr/bin/sed -i ''
\"s|//#define LLDB_VERSION$|#define LLDB_VERSION $LLDB_VERSION |\" \"$file\"\n
/usr/bin/sed -i '' \"s|//#define LLDB_REVISION|#define LLDB_REVISION
$LLDB_REVISION |\" \"$file\"\n /usr/bin/sed -i '' \"s|//#define
LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \\\"$LLDB_VERSION_STRING\\\"
|\" \"$file\"\ndone\n";
};
261EECA21337D399001D193C /* Build llvm and clang */ = {
isa = PBXShellScriptBuildPhase;
@@ -7317,7 +7317,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "/usr/bin/python
$SRCROOT/scripts/prepare_bindings.py --find-swig --framework --src-root
$SRCROOT --target-dir $TARGET_BUILD_DIR --config-build-dir $BUILT_PRODUCTS_DIR
--target-platform Darwin";
+ shellScript = "/usr/bin/python
$SRCROOT/scripts/prepare_bindings.py --find-swig --framework --src-root
$SRCROOT --target-dir $TARGET_BUILD_DIR --config-build-dir $BUILT_PRODUCTS_DIR
--target-platform Darwin\n";
};
4959511A1A1ACE9500F6F8FC /* Install Clang compiler headers */ =
{
isa = PBXShellScriptBuildPhase;
@@ -7332,7 +7332,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/usr/bin/python
$SRCROOT/scripts/Xcode/package-clang-headers.py $TARGET_BUILD_DIR
$LLVM_BUILD_DIR/$CURRENT_ARCH";
+ shellScript = "/usr/bin/python
$SRCROOT/scripts/Xcode/package-clang-headers.py $TARGET_BUILD_DIR
$LLVM_BUILD_DIR/$CURRENT_ARCH\n";
};
4C3326CA18B2A2B800EB5DD7 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -9578,6 +9578,8 @@
"-sectcreate",
__TEXT,
__info_plist,
+ "-filelist",
+ "$(LLVM_BUILD_DIR)/archives.txt",
"$(PROJECT_DIR)/tools/driver/lldb-Info.plist",
"-Wl,-rpath,@loader_path/../../../System/Library/PrivateFrameworks",
);
@@ -9586,6 +9588,8 @@
"-sectcreate",
__TEXT,
__info_plist,
+ "-filelist",
+ "$(LLVM_BUILD_DIR)/archives.txt",
"$(PROJECT_DIR)/tools/driver/lldb-Info.plist",
"-Wl,-rpath,@loader_path/../../Library/PrivateFrameworks",
"-Wl,-rpath,@loader_path/../../../SharedFrameworks",
@@ -10140,6 +10144,8 @@
__info_plist,
"$(PROJECT_DIR)/tools/driver/lldb-Info.plist",
"-Wl,-rpath,@loader_path",
+ "-filelist",
+ "$(LLVM_BUILD_DIR)/archives.txt",
);
PRODUCT_NAME = lldb;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include
$(SRCROOT)/source $(LLVM_SOURCE_DIR)/include
$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include";
@@ -10168,6 +10174,8 @@
__info_plist,
"$(PROJECT_DIR)/tools/driver/lldb-Info.plist",
"-Wl,-rpath,@loader_path",
+ "-filelist",
+ "$(LLVM_BUILD_DIR)/archives.txt",
);
PRODUCT_NAME = lldb;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include
$(SRCROOT)/source $(LLVM_SOURCE_DIR)/include
$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include";
@@ -10313,6 +10321,8 @@
__info_plist,
"$(PROJECT_DIR)/tools/driver/lldb-Info.plist",
"-Wl,-rpath,@loader_path",
+ "-filelist",
+ "$(LLVM_BUILD_DIR)/archives.txt",
);
PRODUCT_NAME = lldb;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include
$(SRCROOT)/source $(LLVM_SOURCE_DIR)/include
$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include";
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
