Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1067)

Unified Diff: runtime/bin/BUILD.gn

Issue 2552203006: Fuchsia: Reland enable observatory. Pass rpath for host builds. (Closed)
Patch Set: Add configs instead of copying flags Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/observatory/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/BUILD.gn
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 07b9b1707e6c6a10e699d58bde1c264bcb645f2a..495d1176725dab7fb4d5743b4a93f7ca69c250c7 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -564,6 +564,17 @@ template("dart_executable") {
"..:dart_maybe_product_config",
] + extra_configs
+ if (defined(is_fuchsia_host) && is_fuchsia_host) {
+ # We already have these in the standalone build, but Fuchsia doesn't
+ # have them. They are needed for running Fuchsia binaries built for the
+ # host.
+ if (is_linux) {
+ configs += [ "../../build/config/gcc:executable_ldconfig" ]
+ } else if (is_mac) {
+ configs += [ "../../build/config/mac:mac_dynamic_flags" ]
+ }
+ }
+
deps = [
":gen_resources_cc",
":standalone_dart_io",
@@ -607,37 +618,35 @@ template("dart_executable") {
}
}
-if (!defined(is_fuchsia) || !is_fuchsia) {
- dart_executable("dart") {
- extra_deps = [
- "..:libdart",
- ":dart_snapshot_cc",
- "../observatory:standalone_observatory_archive",
- ]
- extra_sources = [ "builtin_nolib.cc" ]
- }
+dart_executable("dart") {
+ extra_deps = [
+ "..:libdart",
+ ":dart_snapshot_cc",
+ "../observatory:standalone_observatory_archive",
+ ]
+ extra_sources = [ "builtin_nolib.cc" ]
+}
- dart_executable("dart_noopt") {
- extra_configs = [ "..:dart_precompiler_config" ]
- extra_deps = [
- "..:libdart_noopt",
- ":dart_snapshot_cc",
- "../observatory:standalone_observatory_archive",
- ]
- extra_sources = [ "builtin_nolib.cc" ]
- }
+dart_executable("dart_noopt") {
+ extra_configs = [ "..:dart_precompiler_config" ]
+ extra_deps = [
+ "..:libdart_noopt",
+ ":dart_snapshot_cc",
+ "../observatory:standalone_observatory_archive",
+ ]
+ extra_sources = [ "builtin_nolib.cc" ]
+}
- dart_executable("dart_precompiled_runtime") {
- extra_configs = [ "..:dart_precompiled_runtime_config" ]
- extra_deps = [
- "..:libdart_precompiled_runtime",
- "../observatory:standalone_observatory_archive",
- ]
- extra_sources = [
- "builtin_nolib.cc",
- "snapshot_empty.cc",
- ]
- }
+dart_executable("dart_precompiled_runtime") {
+ extra_configs = [ "..:dart_precompiled_runtime_config" ]
+ extra_deps = [
+ "..:libdart_precompiled_runtime",
+ "../observatory:standalone_observatory_archive",
+ ]
+ extra_sources = [
+ "builtin_nolib.cc",
+ "snapshot_empty.cc",
+ ]
}
dart_executable("dart_bootstrap") {
« no previous file with comments | « no previous file | runtime/observatory/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698