Fixing Chromium build all
To prevent Chromium from building the "swiftshader_subzero"
source set when building all, the source set is now located
within an "if (use_swiftshader_with_subzero)" statement.
Change-Id: I4363487103ec8cd6856b1afb0dd861146a3e56bd
Reviewed-on: https://swiftshader-review.googlesource.com/8728
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
index 499b838..ee93357 100644
--- a/src/Reactor/BUILD.gn
+++ b/src/Reactor/BUILD.gn
@@ -143,100 +143,102 @@
}
}
-source_set("swiftshader_subzero") {
- subzero_dir = "../../third_party/pnacl-subzero"
- subzero_llvm_dir = "../../third_party/llvm-subzero"
+if (use_swiftshader_with_subzero) {
+ source_set("swiftshader_subzero") {
+ subzero_dir = "../../third_party/pnacl-subzero"
+ subzero_llvm_dir = "../../third_party/llvm-subzero"
- sources = [
- "$subzero_dir/src/IceAssembler.cpp",
- "$subzero_dir/src/IceCfg.cpp",
- "$subzero_dir/src/IceCfgNode.cpp",
- "$subzero_dir/src/IceClFlags.cpp",
- "$subzero_dir/src/IceELFObjectWriter.cpp",
- "$subzero_dir/src/IceELFSection.cpp",
- "$subzero_dir/src/IceFixups.cpp",
- "$subzero_dir/src/IceGlobalContext.cpp",
- "$subzero_dir/src/IceGlobalInits.cpp",
- "$subzero_dir/src/IceInst.cpp",
- "$subzero_dir/src/IceInstrumentation.cpp",
- "$subzero_dir/src/IceIntrinsics.cpp",
- "$subzero_dir/src/IceLiveness.cpp",
- "$subzero_dir/src/IceLoopAnalyzer.cpp",
- "$subzero_dir/src/IceMangling.cpp",
- "$subzero_dir/src/IceMemory.cpp",
- "$subzero_dir/src/IceOperand.cpp",
- "$subzero_dir/src/IceRNG.cpp",
- "$subzero_dir/src/IceRangeSpec.cpp",
- "$subzero_dir/src/IceRegAlloc.cpp",
- "$subzero_dir/src/IceRevision.cpp",
- "$subzero_dir/src/IceSwitchLowering.cpp",
- "$subzero_dir/src/IceTargetLowering.cpp",
- "$subzero_dir/src/IceTargetLoweringX86.cpp",
- "$subzero_dir/src/IceThreading.cpp",
- "$subzero_dir/src/IceTimerTree.cpp",
- "$subzero_dir/src/IceTypes.cpp",
- "$subzero_dir/src/IceVariableSplitting.cpp",
- "$subzero_llvm_dir/lib/Demangle/ItaniumDemangle.cpp",
- "$subzero_llvm_dir/lib/Support/APInt.cpp",
- "$subzero_llvm_dir/lib/Support/Atomic.cpp",
- "$subzero_llvm_dir/lib/Support/CommandLine.cpp",
- "$subzero_llvm_dir/lib/Support/ConvertUTF.cpp",
- "$subzero_llvm_dir/lib/Support/ConvertUTFWrapper.cpp",
- "$subzero_llvm_dir/lib/Support/Debug.cpp",
- "$subzero_llvm_dir/lib/Support/Errno.cpp",
- "$subzero_llvm_dir/lib/Support/ErrorHandling.cpp",
- "$subzero_llvm_dir/lib/Support/FoldingSet.cpp",
- "$subzero_llvm_dir/lib/Support/Hashing.cpp",
- "$subzero_llvm_dir/lib/Support/Host.cpp",
- "$subzero_llvm_dir/lib/Support/ManagedStatic.cpp",
- "$subzero_llvm_dir/lib/Support/MemoryBuffer.cpp",
- "$subzero_llvm_dir/lib/Support/Mutex.cpp",
- "$subzero_llvm_dir/lib/Support/NativeFormatting.cpp",
- "$subzero_llvm_dir/lib/Support/Path.cpp",
- "$subzero_llvm_dir/lib/Support/Process.cpp",
- "$subzero_llvm_dir/lib/Support/Program.cpp",
- "$subzero_llvm_dir/lib/Support/Regex.cpp",
- "$subzero_llvm_dir/lib/Support/Signals.cpp",
- "$subzero_llvm_dir/lib/Support/SmallPtrSet.cpp",
- "$subzero_llvm_dir/lib/Support/SmallVector.cpp",
- "$subzero_llvm_dir/lib/Support/StringExtras.cpp",
- "$subzero_llvm_dir/lib/Support/StringMap.cpp",
- "$subzero_llvm_dir/lib/Support/StringRef.cpp",
- "$subzero_llvm_dir/lib/Support/StringSaver.cpp",
- "$subzero_llvm_dir/lib/Support/TargetParser.cpp",
- "$subzero_llvm_dir/lib/Support/Threading.cpp",
- "$subzero_llvm_dir/lib/Support/Timer.cpp",
- "$subzero_llvm_dir/lib/Support/Triple.cpp",
- "$subzero_llvm_dir/lib/Support/Twine.cpp",
- "$subzero_llvm_dir/lib/Support/circular_raw_ostream.cpp",
- "$subzero_llvm_dir/lib/Support/raw_os_ostream.cpp",
- "$subzero_llvm_dir/lib/Support/raw_ostream.cpp",
- "$subzero_llvm_dir/lib/Support/regcomp.c",
- "$subzero_llvm_dir/lib/Support/regerror.c",
- "$subzero_llvm_dir/lib/Support/regexec.c",
- "$subzero_llvm_dir/lib/Support/regfree.c",
- "$subzero_llvm_dir/lib/Support/regstrlcpy.c",
- ]
-
- if (target_cpu == "x64") {
- sources += [
- "$subzero_dir/src/IceInstX8664.cpp",
- "$subzero_dir/src/IceTargetLoweringX8664.cpp",
+ sources = [
+ "$subzero_dir/src/IceAssembler.cpp",
+ "$subzero_dir/src/IceCfg.cpp",
+ "$subzero_dir/src/IceCfgNode.cpp",
+ "$subzero_dir/src/IceClFlags.cpp",
+ "$subzero_dir/src/IceELFObjectWriter.cpp",
+ "$subzero_dir/src/IceELFSection.cpp",
+ "$subzero_dir/src/IceFixups.cpp",
+ "$subzero_dir/src/IceGlobalContext.cpp",
+ "$subzero_dir/src/IceGlobalInits.cpp",
+ "$subzero_dir/src/IceInst.cpp",
+ "$subzero_dir/src/IceInstrumentation.cpp",
+ "$subzero_dir/src/IceIntrinsics.cpp",
+ "$subzero_dir/src/IceLiveness.cpp",
+ "$subzero_dir/src/IceLoopAnalyzer.cpp",
+ "$subzero_dir/src/IceMangling.cpp",
+ "$subzero_dir/src/IceMemory.cpp",
+ "$subzero_dir/src/IceOperand.cpp",
+ "$subzero_dir/src/IceRNG.cpp",
+ "$subzero_dir/src/IceRangeSpec.cpp",
+ "$subzero_dir/src/IceRegAlloc.cpp",
+ "$subzero_dir/src/IceRevision.cpp",
+ "$subzero_dir/src/IceSwitchLowering.cpp",
+ "$subzero_dir/src/IceTargetLowering.cpp",
+ "$subzero_dir/src/IceTargetLoweringX86.cpp",
+ "$subzero_dir/src/IceThreading.cpp",
+ "$subzero_dir/src/IceTimerTree.cpp",
+ "$subzero_dir/src/IceTypes.cpp",
+ "$subzero_dir/src/IceVariableSplitting.cpp",
+ "$subzero_llvm_dir/lib/Demangle/ItaniumDemangle.cpp",
+ "$subzero_llvm_dir/lib/Support/APInt.cpp",
+ "$subzero_llvm_dir/lib/Support/Atomic.cpp",
+ "$subzero_llvm_dir/lib/Support/CommandLine.cpp",
+ "$subzero_llvm_dir/lib/Support/ConvertUTF.cpp",
+ "$subzero_llvm_dir/lib/Support/ConvertUTFWrapper.cpp",
+ "$subzero_llvm_dir/lib/Support/Debug.cpp",
+ "$subzero_llvm_dir/lib/Support/Errno.cpp",
+ "$subzero_llvm_dir/lib/Support/ErrorHandling.cpp",
+ "$subzero_llvm_dir/lib/Support/FoldingSet.cpp",
+ "$subzero_llvm_dir/lib/Support/Hashing.cpp",
+ "$subzero_llvm_dir/lib/Support/Host.cpp",
+ "$subzero_llvm_dir/lib/Support/ManagedStatic.cpp",
+ "$subzero_llvm_dir/lib/Support/MemoryBuffer.cpp",
+ "$subzero_llvm_dir/lib/Support/Mutex.cpp",
+ "$subzero_llvm_dir/lib/Support/NativeFormatting.cpp",
+ "$subzero_llvm_dir/lib/Support/Path.cpp",
+ "$subzero_llvm_dir/lib/Support/Process.cpp",
+ "$subzero_llvm_dir/lib/Support/Program.cpp",
+ "$subzero_llvm_dir/lib/Support/Regex.cpp",
+ "$subzero_llvm_dir/lib/Support/Signals.cpp",
+ "$subzero_llvm_dir/lib/Support/SmallPtrSet.cpp",
+ "$subzero_llvm_dir/lib/Support/SmallVector.cpp",
+ "$subzero_llvm_dir/lib/Support/StringExtras.cpp",
+ "$subzero_llvm_dir/lib/Support/StringMap.cpp",
+ "$subzero_llvm_dir/lib/Support/StringRef.cpp",
+ "$subzero_llvm_dir/lib/Support/StringSaver.cpp",
+ "$subzero_llvm_dir/lib/Support/TargetParser.cpp",
+ "$subzero_llvm_dir/lib/Support/Threading.cpp",
+ "$subzero_llvm_dir/lib/Support/Timer.cpp",
+ "$subzero_llvm_dir/lib/Support/Triple.cpp",
+ "$subzero_llvm_dir/lib/Support/Twine.cpp",
+ "$subzero_llvm_dir/lib/Support/circular_raw_ostream.cpp",
+ "$subzero_llvm_dir/lib/Support/raw_os_ostream.cpp",
+ "$subzero_llvm_dir/lib/Support/raw_ostream.cpp",
+ "$subzero_llvm_dir/lib/Support/regcomp.c",
+ "$subzero_llvm_dir/lib/Support/regerror.c",
+ "$subzero_llvm_dir/lib/Support/regexec.c",
+ "$subzero_llvm_dir/lib/Support/regfree.c",
+ "$subzero_llvm_dir/lib/Support/regstrlcpy.c",
]
- } else {
- sources += [
- "$subzero_dir/src/IceInstX8632.cpp",
- "$subzero_dir/src/IceTargetLoweringX8632.cpp",
+
+ if (target_cpu == "x64") {
+ sources += [
+ "$subzero_dir/src/IceInstX8664.cpp",
+ "$subzero_dir/src/IceTargetLoweringX8664.cpp",
+ ]
+ } else {
+ sources += [
+ "$subzero_dir/src/IceInstX8632.cpp",
+ "$subzero_dir/src/IceTargetLoweringX8632.cpp",
+ ]
+ }
+
+ if (is_win) {
+ configs -= [ "//build/config/win:unicode" ]
+ }
+ configs += [
+ ":swiftshader_subzero_common_private_config",
+ ":swiftshader_subzero_private_config",
]
}
-
- if (is_win) {
- configs -= [ "//build/config/win:unicode" ]
- }
- configs += [
- ":swiftshader_subzero_common_private_config",
- ":swiftshader_subzero_private_config",
- ]
}
source_set("swiftshader_reactor") {
