diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java index 890036b9b1..ebca7dfb0a 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java @@ -185,7 +185,8 @@ public class StandaloneSpawnStrategy implements SpawnActionContext { xcrunStatus.toString(), new String(xcrunResult.getStderr(), StandardCharsets.UTF_8))); } - envBuilder.put("SDKROOT", new String(xcrunResult.getStdout(), StandardCharsets.UTF_8)); + // calling xcrun via Command returns a value with a newline on the end. + envBuilder.put("SDKROOT", new String(xcrunResult.getStdout(), StandardCharsets.UTF_8).trim()); } catch (AbnormalTerminationException e) { String message = String.format("%s : %s", e.getResult().getTerminationStatus(), new String(e.getResult().getStderr())); |