Add missing FD_HAS_{HOSTED,ALLOCA,DOUBLE} guards

riptl · ripatel-fd · commit c9e6179ba45a · 2025-11-12T00:52:26.000-06:00
diff --git a/src/choreo/eqvoc/Local.mk b/src/choreo/eqvoc/Local.mk
@@ -1,5 +1,7 @@
+ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_eqvoc.h)
 $(call add-objs,fd_eqvoc,fd_choreo)
 ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_eqvoc,test_eqvoc,fd_choreo fd_flamenco fd_ballet fd_util)
 endif
+endif
diff --git a/src/choreo/ghost/Local.mk b/src/choreo/ghost/Local.mk
@@ -1,6 +1,8 @@
+ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_ghost.h)
 $(call add-objs,fd_ghost,fd_choreo)
 ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_ghost,test_ghost,fd_choreo fd_flamenco fd_tango fd_ballet fd_util)
 $(call run-unit-test,test_ghost)
 endif
+endif
diff --git a/src/choreo/ghost/fd_ghost.h b/src/choreo/ghost/fd_ghost.h
@@ -490,7 +490,8 @@ static int FD_FN_UNUSED
 is_duplicate_confirmed( fd_ghost_t * ghost, fd_hash_t const * hash, ulong total_stake ) {
   fd_ghost_ele_t const * ele = fd_ghost_query( ghost, hash );
   if( FD_UNLIKELY( !ele ) ) {
-    FD_LOG_WARNING(( "[%s] slot %s was not in ghost", __func__, FD_BASE58_ENC_32_ALLOCA(hash) ));
+    FD_BASE58_ENCODE_32_BYTES( hash->uc, hash_b58 );
+    FD_LOG_WARNING(( "[%s] slot %s was not in ghost", __func__, hash_b58 ));
     return 0;
   }
   double pct = (double)( ele->weight + ele->gossip_stake ) / (double)total_stake; /* TODO make gossip weight a field as well */
diff --git a/src/disco/bundle/Local.mk b/src/disco/bundle/Local.mk
@@ -4,8 +4,8 @@ $(call make-unit-test,test_bundle_crank,test_bundle_crank,fd_disco fd_flamenco f
 $(call run-unit-test,test_bundle_crank)
 
 $(call add-hdrs,fd_bundle_tile.h)
-$(call add-objs,fd_bundle_auth fd_bundle_client,fd_disco)
 ifdef FD_HAS_HOSTED
+$(call add-objs,fd_bundle_auth fd_bundle_client,fd_disco)
 $(call make-unit-test,test_bundle_client,test_bundle_client,fd_disco fd_waltz fd_flamenco fd_tango fd_ballet fd_util,$(OPENSSL_LIBS))
 $(call run-unit-test,test_bundle_client)
 $(call make-fuzz-test,fuzz_bundle_client,fuzz_bundle_client,fd_disco fd_waltz fd_flamenco fd_tango fd_ballet fd_util,$(OPENSSL_LIBS))
diff --git a/src/disco/metrics/Local.mk b/src/disco/metrics/Local.mk
@@ -1,5 +1,5 @@
-ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_prometheus.h fd_metrics.h)
 $(call add-objs,fd_prometheus fd_metrics ,fd_disco)
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_metric_tile,fd_disco)
 endif
diff --git a/src/disco/plugin/Local.mk b/src/disco/plugin/Local.mk
@@ -1 +1,3 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_plugin_tile,fd_disco,fd_flamenco)
+endif
diff --git a/src/disco/shred/Local.mk b/src/disco/shred/Local.mk
@@ -2,7 +2,9 @@ $(call add-objs,fd_shred_dest,fd_disco)
 $(call add-objs,fd_shredder,fd_disco)
 $(call add-objs,fd_fec_resolver,fd_disco)
 $(call add-objs,fd_stake_ci,fd_disco)
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_shred_tile,fd_disco)
+endif
 $(call make-unit-test,test_shred_dest,test_shred_dest,fd_disco fd_flamenco fd_ballet fd_util)
 ifdef FD_ARCH_SUPPORTS_SANDBOX
 $(call make-unit-test,test_shred_tile,test_shred_tile,fdctl_shared fdctl_platform fd_disco fd_flamenco fd_ballet fd_tango fd_waltz fd_reedsol fd_funk fd_util)
diff --git a/src/disco/store/Local.mk b/src/disco/store/Local.mk
@@ -1,6 +1,8 @@
+ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_store.h)
 $(call add-objs,fd_store,fd_disco)
 ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_store,test_store,fd_disco fd_flamenco fd_tango fd_ballet fd_util)
 $(call run-unit-test,test_store)
 endif
+endif
diff --git a/src/discof/exec/Local.mk b/src/discof/exec/Local.mk
@@ -1 +1,3 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_exec_tile,fd_discof)
+endif
diff --git a/src/discof/forest/Local.mk b/src/discof/forest/Local.mk
@@ -1,2 +1,4 @@
 $(call add-objs,fd_forest,fd_discof)
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_forest,test_forest,fd_discof fd_disco fd_flamenco fd_tango fd_ballet fd_util)
+endif
diff --git a/src/discof/gossip/Local.mk b/src/discof/gossip/Local.mk
@@ -1,2 +1,4 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_gossip_tile,fd_discof)
 $(call add-objs,fd_gossvf_tile,fd_discof)
+endif
diff --git a/src/discof/reasm/Local.mk b/src/discof/reasm/Local.mk
@@ -1,5 +1,7 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_reasm,fd_discof)
 ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_reasm,test_reasm,fd_discof fd_flamenco fd_ballet fd_util)
 $(call run-unit-test,test_reasm)
 endif
+endif
diff --git a/src/discof/repair/Local.mk b/src/discof/repair/Local.mk
@@ -1,4 +1,6 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_repair_tile,fd_discof)
+endif
 $(call add-objs,fd_policy,fd_discof)
 $(call add-hdrs,fd_policy.h)
 $(call add-objs,fd_inflight,fd_discof)
diff --git a/src/discof/replay/Local.mk b/src/discof/replay/Local.mk
@@ -2,7 +2,9 @@ $(call add-hdrs,fd_exec.h)
 $(call add-objs,fd_rdisp,fd_discof)
 $(call make-unit-test,test_rdisp,test_rdisp,fd_discof fd_ballet fd_tango fd_util)
 $(call run-unit-test,test_rdisp,)
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_sched,fd_discof)
+endif
 ifdef FD_HAS_ZSTD # required to load snapshot
 $(call add-objs,fd_replay_tile,fd_discof)
 
diff --git a/src/discof/restore/Local.mk b/src/discof/restore/Local.mk
@@ -1,25 +1,31 @@
+ifdef FD_HAS_ALLOCA
 ifdef FD_HAS_SSE
 $(call add-hdrs,fd_snapct_tile.h)
 $(call add-objs,fd_snapct_tile,fd_discof)
 $(call add-objs,fd_snapld_tile,fd_discof)
 ifdef FD_HAS_ZSTD
 $(call add-objs,fd_snapdc_tile,fd_discof)
-endif
+endif # FD_HAS_ZSTD
 $(call add-objs,fd_snapin_tile fd_snapin_tile_funk fd_snapin_tile_vinyl,fd_discof)
-endif
+endif # FD_HAS_SSE
 $(call add-objs,fd_snapwh_tile,fd_discof)
 $(call add-objs,fd_snapwr_tile,fd_discof)
+endif # FD_HAS_ALLOCA
 $(call add-objs,utils/fd_ssparse,fd_discof)
 $(call add-objs,utils/fd_ssmanifest_parser,fd_discof)
 $(call add-objs,utils/fd_ssload,fd_discof)
 $(call add-objs,utils/fd_ssping,fd_discof)
+ifdef FD_HAS_HOSTED
 $(call add-objs,utils/fd_http_resolver,fd_discof)
+endif # FD_HAS_HOSTED
 $(call add-objs,utils/fd_slot_delta_parser,fd_discof)
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_ssmanifest_parser,utils/test_ssmanifest_parser,fd_discof fd_flamenco fd_ballet fd_util)
 $(call make-unit-test,test_slot_delta_parser,utils/test_slot_delta_parser,fd_discof fd_flamenco fd_ballet fd_util)
 $(call make-unit-test,test_sspeer_selector,utils/test_sspeer_selector,fd_discof fd_flamenco fd_ballet fd_util)
 $(call run-unit-test,test_slot_delta_parser)
 $(call run-unit-test,test_sspeer_selector)
+endif
 
 ifdef FD_HAS_HOSTED
 $(call make-fuzz-test,fuzz_snapshot_parser,utils/fuzz_snapshot_parser,fd_discof fd_flamenco fd_ballet fd_util)
diff --git a/src/discof/send/Local.mk b/src/discof/send/Local.mk
@@ -1 +1,3 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_send_tile,fd_discof)
+endif
diff --git a/src/discof/shredcap/Local.mk b/src/discof/shredcap/Local.mk
@@ -1 +1,3 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_shredcap_tile,fd_discof)
+endif
diff --git a/src/discof/tower/Local.mk b/src/discof/tower/Local.mk
@@ -1 +1,3 @@
+ifdef FD_HAS_ALLOCA
 $(call add-objs,fd_tower_tile,fd_discof)
+endif
diff --git a/src/flamenco/runtime/Local.mk b/src/flamenco/runtime/Local.mk
@@ -1,8 +1,10 @@
 $(call add-hdrs,fd_acc_mgr.h)
 $(call add-objs,fd_acc_mgr,fd_flamenco)
 
+ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_bank_hash_cmp.h)
 $(call add-objs,fd_bank_hash_cmp,fd_flamenco)
+endif
 
 $(call add-hdrs,fd_blockhashes.h)
 $(call add-objs,fd_blockhashes,fd_flamenco)
@@ -16,18 +18,24 @@ endif
 
 $(call add-hdrs,fd_hashes.h)
 $(call add-objs,fd_hashes,fd_flamenco)
+ifdef FD_HAS_INT128
 $(call make-unit-test,test_hashes,test_hashes,fd_flamenco fd_funk fd_ballet fd_util)
+endif
 
 $(call add-hdrs,fd_pubkey_utils.h)
 $(call add-objs,fd_pubkey_utils,fd_flamenco)
 
+ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_txncache_shmem.h fd_txncache.h)
 $(call add-objs,fd_txncache_shmem fd_txncache,fd_flamenco)
+endif
 
 $(call add-hdrs,fd_cost_tracker.h)
 $(call add-objs,fd_cost_tracker,fd_flamenco)
+ifdef FD_HAS_INT128
 $(call make-unit-test,test_cost_tracker,test_cost_tracker,fd_flamenco fd_funk fd_ballet fd_util)
 $(call run-unit-test,test_cost_tracker,)
+endif
 
 $(call add-hdrs,fd_compute_budget_details.h)
 $(call add-objs,fd_compute_budget_details,fd_flamenco)
@@ -40,18 +48,25 @@ $(call add-objs, tests/fd_dump_pb,fd_flamenco)
 
 $(call add-hdrs,fd_txn_account.h)
 $(call add-objs,fd_txn_account,fd_flamenco)
+ifdef FD_HAS_INT128
 $(call make-unit-test,test_txn_account,test_txn_account,fd_flamenco fd_funk fd_ballet fd_util)
 $(call run-unit-test,test_txn_account,)
+endif
+
 ifdef FD_HAS_SECP256K1
 $(call make-unit-test,test_runtime_alut,test_runtime_alut,fd_flamenco fd_funk fd_ballet fd_util)
 endif
 
 $(call add-hdrs,fd_bank.h)
 $(call add-objs,fd_bank,fd_flamenco)
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_bank,test_bank,fd_flamenco fd_funk fd_ballet fd_util)
 $(call run-unit-test,test_bank,)
+endif
 
+ifdef FD_HAS_ALLOCA
 $(call make-unit-test,test_txncache,test_txncache,fd_flamenco fd_ballet fd_util)
+endif
 
 ifdef FD_HAS_ATOMIC
 $(call add-hdrs,fd_runtime.h fd_runtime_init.h fd_runtime_err.h fd_runtime_const.h fd_runtime_stack.h fd_exec_stack.h)
diff --git a/src/flamenco/runtime/fd_core_bpf_migration.c b/src/flamenco/runtime/fd_core_bpf_migration.c
@@ -40,7 +40,7 @@ tmp_account_read( fd_tmp_account_t *        acc,
       NULL );
   if( FD_UNLIKELY( opt_err!=FD_ACC_MGR_SUCCESS ) ) {
     if( FD_LIKELY( opt_err==FD_ACC_MGR_ERR_UNKNOWN_ACCOUNT ) ) return NULL;
-    FD_LOG_CRIT(( "fd_funk_get_acc_meta_readonly failed (%d) %s", opt_err, FD_BASE58_ENC_32_ALLOCA( addr ) ));
+    FD_LOG_CRIT(( "fd_funk_get_acc_meta_readonly failed (%d)", opt_err ));
   }
   tmp_account_new( acc, meta->dlen );
   acc->meta = *meta;
diff --git a/src/flamenco/runtime/fd_txn_account.c b/src/flamenco/runtime/fd_txn_account.c
@@ -201,14 +201,16 @@ fd_txn_account_mutable_fini( fd_txn_account_t *      acct,
   if( prepare->rec ) {
     /* Check that the prepared record is not the Funk null value */
     if( !prepare->rec->val_gaddr ) {
+      FD_BASE58_ENCODE_32_BYTES( acct->pubkey->uc, acct_pubkey_b58 );
       FD_LOG_CRIT(( "invalid prepared record for %s: unexpected NULL funk record value. the record might have been modified by another thread",
-                   FD_BASE58_ENC_32_ALLOCA( acct->pubkey ) ));
+                    acct_pubkey_b58 ));
     }
 
     /* Ensure that the prepared record key still matches our key. */
     if( FD_UNLIKELY( memcmp( prepare->rec->pair.key, &key, sizeof(fd_funk_rec_key_t) )!=0 ) ) {
+      FD_BASE58_ENCODE_32_BYTES( acct->pubkey->uc, acct_pubkey_b58 );
       FD_LOG_CRIT(( "invalid prepared record for %s: the record might have been modified by another thread",
-                  FD_BASE58_ENC_32_ALLOCA( acct->pubkey ) ));
+                    acct_pubkey_b58 ));
     }
 
     /* Crashes the app if this key already exists in funk (conflicting
diff --git a/src/flamenco/runtime/program/Local.mk b/src/flamenco/runtime/program/Local.mk
@@ -30,11 +30,15 @@ $(call add-objs,fd_config_program,fd_flamenco)
 $(call add-hdrs,fd_compute_budget_program.h)
 $(call add-objs,fd_compute_budget_program,fd_flamenco)
 
+ifdef FD_HAS_DOUBLE
 $(call add-hdrs,fd_stake_program.h)
 $(call add-objs,fd_stake_program,fd_flamenco)
+endif
 
+ifdef FD_HAS_ALLOCA
 $(call add-hdrs,fd_system_program.h)
 $(call add-objs,fd_system_program fd_system_program_nonce,fd_flamenco)
+endif
 
 $(call add-hdrs,fd_vote_program.h)
 $(call add-objs,fd_vote_program,fd_flamenco)
diff --git a/src/flamenco/runtime/program/fd_address_lookup_table_program.c b/src/flamenco/runtime/program/fd_address_lookup_table_program.c
@@ -297,8 +297,9 @@ create_lookup_table( fd_exec_instr_ctx_t *       ctx,
   /* https://github.com/solana-labs/solana/blob/v1.17.4/programs/address-lookup-table/src/processor.rs#L120-L127 */
   if( FD_UNLIKELY( 0!=memcmp( lut_key->key, derived_tbl_key->key, sizeof(fd_pubkey_t) ) ) ) {
     /* Max msg_sz: 44 - 2 + 45 = 87 < 127 => we can use printf */
+    FD_BASE58_ENCODE_32_BYTES( derived_tbl_key->uc, derived_tbl_key_b58 );
     fd_log_collector_printf_dangerous_max_127( ctx,
-      "Table address must match derived address: %s", FD_BASE58_ENC_32_ALLOCA( derived_tbl_key ) );
+      "Table address must match derived address: %s", derived_tbl_key_b58 );
     return FD_EXECUTOR_INSTR_ERR_INVALID_ARG;
   }
 
diff --git a/src/flamenco/runtime/program/fd_config_program.c b/src/flamenco/runtime/program/fd_config_program.c
@@ -129,17 +129,19 @@ _process_config_instr( fd_exec_instr_ctx_t * ctx ) {
       int borrow_err = fd_exec_instr_ctx_try_borrow_instr_account( ctx, (uchar)counter, &signer_account );
       if( FD_UNLIKELY( borrow_err ) ) {
         /* Max msg_sz: 33 - 2 + 45 = 76 < 127 => we can use printf */
+        FD_BASE58_ENCODE_32_BYTES( signer->uc, signer_b58 );
         fd_log_collector_printf_dangerous_max_127( ctx,
-          "account %s is not in account list", FD_BASE58_ENC_32_ALLOCA( signer ) );
+          "account %s is not in account list", signer_b58 );
         return FD_EXECUTOR_INSTR_ERR_MISSING_REQUIRED_SIGNATURE;
       }
 
       /* https://github.com/solana-labs/solana/blob/v1.17.17/programs/config/src/config_processor.rs#L72-L79 */
 
       if( FD_UNLIKELY( !fd_instr_acc_is_signer_idx( ctx->instr, (uchar)counter, NULL ) ) ) {
         /* Max msg_sz: 33 - 2 + 45 = 76 < 127 => we can use printf */
+        FD_BASE58_ENCODE_32_BYTES( signer->uc, signer_b58 );
         fd_log_collector_printf_dangerous_max_127( ctx,
-          "account %s signer_key().is_none()", FD_BASE58_ENC_32_ALLOCA( signer ) );
+          "account %s signer_key().is_none()", signer_b58 );
         return FD_EXECUTOR_INSTR_ERR_MISSING_REQUIRED_SIGNATURE;
       }
 
@@ -166,8 +168,9 @@ _process_config_instr( fd_exec_instr_ctx_t * ctx ) {
         /* https://github.com/solana-labs/solana/blob/v1.17.17/programs/config/src/config_processor.rs#L97 */
         if( FD_UNLIKELY( !is_signer ) ) {
           /* Max msg_sz: 39 - 2 + 45 = 82 < 127 => we can use printf */
+          FD_BASE58_ENCODE_32_BYTES( signer->uc, signer_b58 );
           fd_log_collector_printf_dangerous_max_127( ctx,
-            "account %s is not in stored signer list", FD_BASE58_ENC_32_ALLOCA( signer ) );
+            "account %s is not in stored signer list", signer_b58 );
           return FD_EXECUTOR_INSTR_ERR_MISSING_REQUIRED_SIGNATURE;
         }
       }
diff --git a/src/flamenco/runtime/sysvar/Local.mk b/src/flamenco/runtime/sysvar/Local.mk
@@ -25,7 +25,10 @@ $(call add-hdrs,fd_sysvar_recent_hashes.h)
 $(call add-objs,fd_sysvar_recent_hashes,fd_flamenco)
 
 $(call add-hdrs,fd_sysvar_rent.h)
-$(call add-objs,fd_sysvar_rent fd_sysvar_rent1,fd_flamenco)
+$(call add-objs,fd_sysvar_rent,fd_flamenco)
+ifdef FD_HAS_DOUBLE
+$(call add-objs,fd_sysvar_rent1,fd_flamenco)
+endif
 
 $(call add-hdrs,fd_sysvar_slot_hashes.h)
 $(call add-objs,fd_sysvar_slot_hashes,fd_flamenco)
diff --git a/src/flamenco/runtime/tests/fd_dump_pb.c b/src/flamenco/runtime/tests/fd_dump_pb.c
@@ -1246,13 +1246,14 @@ FD_SPAD_FRAME_BEGIN( spad ) {
   char encoded_signature[FD_BASE58_ENCODED_64_SZ];
   fd_base58_encode_64( signature, NULL, encoded_signature );
 
+  FD_BASE58_ENCODE_32_BYTES( program_acc->pubkey->uc, program_acc_b58 );
   char filename[ PATH_MAX ];
   snprintf( filename,
           PATH_MAX,
           "%s/elf-%s-%s-%lu.elfctx",
           txn_ctx->capture_ctx->dump_proto_output_dir,
           encoded_signature,
-          FD_BASE58_ENC_32_ALLOCA( program_acc->pubkey ),
+          program_acc_b58,
           txn_ctx->slot );
 
   /* The generated filename should be unique for every call. Silently return otherwise. */
diff --git a/src/flamenco/stakes/Local.mk b/src/flamenco/stakes/Local.mk
@@ -3,10 +3,14 @@ $(call add-objs,fd_stakes,fd_flamenco)
 
 $(call add-hdrs,fd_stake_delegations.h)
 $(call add-objs,fd_stake_delegations,fd_flamenco)
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_stake_delegations,test_stake_delegations,fd_flamenco fd_funk fd_ballet fd_util)
 $(call run-unit-test,test_stake_delegations)
+endif
 
 $(call add-hdrs,fd_vote_states.h)
 $(call add-objs,fd_vote_states,fd_flamenco)
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_vote_states,test_vote_states,fd_flamenco fd_funk fd_ballet fd_util)
 $(call run-unit-test,test_vote_states)
+endif
diff --git a/src/flamenco/types/Local.mk b/src/flamenco/types/Local.mk
@@ -5,12 +5,14 @@ $(call make-unit-test,test_types_walk,test_types_walk,fd_flamenco fd_ballet fd_u
 $(call make-unit-test,test_types_yaml,test_types_yaml,fd_flamenco fd_ballet fd_util)
 $(OBJDIR)/obj/flamenco/types/test_types_fixtures.o: $(wildcard src/flamenco/types/fixtures/*.bin) $(wildcard src/flamenco/types/fixtures/*.yml)
 $(call make-unit-test,test_types_fixtures,test_types_fixtures,fd_flamenco fd_ballet fd_util)
-$(call make-unit-test,test_cast,test_cast,fd_flamenco fd_ballet fd_util)
 $(call run-unit-test,test_types_meta)
 $(call run-unit-test,test_types_walk)
 $(call run-unit-test,test_types_yaml)
 $(call run-unit-test,test_types_fixtures)
+ifdef FD_HAS_DOUBLE
+$(call make-unit-test,test_cast,test_cast,fd_flamenco fd_ballet fd_util)
 $(call run-unit-test,test_cast)
+endif
 
 $(call make-lib fd_flamenco_test)
 $(call add-objs,fd_types_reflect fd_types_reflect_generated,fd_flamenco_test)
diff --git a/src/flamenco/vm/Local.mk b/src/flamenco/vm/Local.mk
@@ -22,5 +22,7 @@ $(call run-unit-test,test_vm_interp)
 endif
 endif
 
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_pointer_chase,test_pointer_chase,fd_util)
 $(call run-unit-test,test_pointer_chase)
+endif
diff --git a/src/vinyl/Local.mk b/src/vinyl/Local.mk
@@ -1,7 +1,11 @@
 $(call make-lib,fd_vinyl)
 $(call add-hdrs,fd_vinyl_base.h fd_vinyl.h)
 $(call add-objs,fd_vinyl_base fd_vinyl_recover fd_vinyl_compact fd_vinyl_cmd fd_vinyl fd_vinyl_exec,fd_vinyl)
+ifdef FD_HAS_HOSTED
 $(call make-bin,fd_vinyl_ctl,fd_vinyl_ctl,fd_vinyl fd_tango fd_util)
+endif
 $(call make-unit-test,test_vinyl_base,test_vinyl_base,fd_vinyl fd_tango fd_util)
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_vinyl_req,test_vinyl_req,fd_vinyl fd_tango fd_util)
+endif
 $(call run-unit-test,test_vinyl_base)
diff --git a/src/vinyl/data/Local.mk b/src/vinyl/data/Local.mk
@@ -1,4 +1,7 @@
 $(call add-hdrs,fd_vinyl_data.h)
 $(call add-objs,fd_vinyl_data fd_vinyl_data_szc_cfg,fd_vinyl)
+
+ifdef FD_HAS_HOSTED
 $(call make-unit-test,test_vinyl_data,test_vinyl_data,fd_vinyl fd_tango fd_util)
 $(call run-unit-test,test_vinyl_data)
+endif

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+ifdef FD_HAS_ALLOCA`
`1`	`2`	`$(call add-objs,fd_plugin_tile,fd_disco,fd_flamenco)`
	`3`	`+endif`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+ifdef FD_HAS_ALLOCA`
`1`	`2`	`$(call add-objs,fd_exec_tile,fd_discof)`
	`3`	`+endif`