From 6d4cc4c910a92c9de664ef99b7b2c3681f8d9cf1 Mon Sep 17 00:00:00 2001 From: plf Date: Tue, 7 Aug 2018 01:59:04 -0700 Subject: C++: Stops passing workspace to whitelist check of providers The workspace changes from user to user and it shouldn't be taken into account. RELNOTES:none PiperOrigin-RevId: 207679881 --- .../com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java index ca3a3d0733..7c3d6cf7ec 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationInfo.java @@ -78,7 +78,10 @@ public final class CcCompilationInfo extends NativeInfo implements CcCompilation @SuppressWarnings("unchecked") protected CcCompilationInfo createInstanceFromSkylark( Object[] args, Environment env, Location loc) throws EvalException { - CcCommon.checkLocationWhitelisted(env.getSemantics(), loc, loc.getPath().toString()); + CcCommon.checkLocationWhitelisted( + env.getSemantics(), + loc, + env.getGlobals().getTransitiveLabel().getPackageIdentifier().toString()); CcCompilationInfo.Builder ccCompilationInfoBuilder = CcCompilationInfo.Builder.create(); CcCompilationContext.Builder ccCompilationContext = new CcCompilationContext.Builder(/* ruleContext= */ null); -- cgit v1.2.3