Skip to content

Commit 207172d

Browse files
committed
Remove copy CLT content build phase
Going to handle this via a different mechanism. rdar://121717582
1 parent 9f5ac59 commit 207172d

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

Xcode/Configs/Common.xcconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ CLANG_CXX_LIBRARY = libc++
6363
COMMON_PREPROCESSOR_DEFINITIONS = $(LLBUILD_VERSION_DEFINITIONS)
6464
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -Wimplicit-fallthrough -Wsign-compare -Wall
6565

66-
// Destination for installing llbuild.framework so it appears in the CommandLineTools package.
67-
// Clients can override this to the empty string to avoid installing anything.
68-
COMMANDLINETOOLS_FRAMEWORK_INSTALL_PATH = $(DSTROOT)/Library/Developer/CommandLineTools/usr/lib/swift/pm/llbuild/llbuild.framework
69-
7066
// Flag to easily enable SKIP_INSTALL for llbuild's CLI tools
7167
SKIP_INSTALL_CLI_TOOLS = NO
7268

llbuild.xcodeproj/project.pbxproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
isa = PBXAggregateTarget;
1212
buildConfigurationList = E178FCC41A1BF3270039F8B5 /* Build configuration list for PBXAggregateTarget "B&I" */;
1313
buildPhases = (
14-
BC92770E1E60449A0020E457 /* Install in CommandLineTools */,
1514
);
1615
dependencies = (
1716
E178FCC61A1BF32F0039F8B5 /* PBXTargetDependency */,
@@ -3939,23 +3938,6 @@
39393938
shellPath = /bin/sh;
39403939
shellScript = "\"${SRCROOT}/utils/Xcode/create-target-link.sh\"\n";
39413940
};
3942-
BC92770E1E60449A0020E457 /* Install in CommandLineTools */ = {
3943-
isa = PBXShellScriptBuildPhase;
3944-
buildActionMask = 8;
3945-
files = (
3946-
);
3947-
inputPaths = (
3948-
"$(BUILT_PRODUCTS_DIR)/llbuild.framework",
3949-
);
3950-
name = "Install in CommandLineTools";
3951-
outputPaths = (
3952-
"$(COMMANDLINETOOLS_FRAMEWORK_INSTALL_PATH)",
3953-
);
3954-
runOnlyForDeploymentPostprocessing = 1;
3955-
shellPath = /bin/sh;
3956-
shellScript = "# This script is used to install llbuild.framework in CommandLineTools.\n\nset -e\nif [ \"${SCRIPT_OUTPUT_FILE_0}\" != \"\" ]; then\n mkdir -p \"$(dirname \"$SCRIPT_OUTPUT_FILE_0\")\"\n rsync -a \"$SCRIPT_INPUT_FILE_0/\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n";
3957-
showEnvVarsInLog = 0;
3958-
};
39593941
E147DF121BA81D330032D08E /* Create Target Link */ = {
39603942
isa = PBXShellScriptBuildPhase;
39613943
buildActionMask = 2147483647;

0 commit comments

Comments
 (0)