Makefile builds: do not inherit SRC from environment

tautschnig · tautschnig · commit 16e1bb549476 · 2025-11-30T22:38:30.000Z
The `override` directive ensures that the `Makefile`'s definition takes precedence over any value inherited from the environment. Fixes: #4834
diff --git a/jbmc/src/janalyzer/Makefile b/jbmc/src/janalyzer/Makefile
@@ -1,4 +1,5 @@
-SRC = janalyzer_main.cpp \
+override SRC = \
+      janalyzer_main.cpp \
       janalyzer_parse_options.cpp \
       # Empty last line
 
diff --git a/jbmc/src/java_bytecode/Makefile b/jbmc/src/java_bytecode/Makefile
@@ -1,4 +1,5 @@
-SRC = assignments_from_json.cpp \
+override SRC = \
+      assignments_from_json.cpp \
       bytecode_info.cpp \
       character_refine_preprocess.cpp \
       ci_lazy_methods.cpp \
diff --git a/jbmc/src/jbmc/Makefile b/jbmc/src/jbmc/Makefile
@@ -1,4 +1,5 @@
-SRC = jbmc_main.cpp \
+override SRC = \
+      jbmc_main.cpp \
       jbmc_parse_options.cpp \
       # Empty last line
 
diff --git a/jbmc/src/jdiff/Makefile b/jbmc/src/jdiff/Makefile
@@ -1,4 +1,5 @@
-SRC = jdiff_languages.cpp \
+override SRC = \
+      jdiff_languages.cpp \
       jdiff_main.cpp \
       jdiff_parse_options.cpp \
       java_syntactic_diff.cpp \
diff --git a/jbmc/src/miniz/Makefile b/jbmc/src/miniz/Makefile
@@ -1,4 +1,5 @@
-SRC = miniz.cpp \
+override SRC = \
+      miniz.cpp \
       # Empty last line
 
 INCLUDES= -I ../$(CPROVER_DIR)/src
diff --git a/jbmc/unit/Makefile b/jbmc/unit/Makefile
@@ -1,11 +1,9 @@
 .PHONY: all jprover.dir test java-testing-utils-clean
 
 # Source files for test utilities
-SRC = $(CPROVER_DIR)/unit/unit_tests.cpp \
-      # Empty last line
-
-# Test source files
-SRC += java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp \
+override SRC = \
+       $(CPROVER_DIR)/unit/unit_tests.cpp \
+       java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp \
        java_bytecode/expr2java.cpp \
        java_bytecode/goto_program_generics/generic_bases_test.cpp \
        java_bytecode/goto_program_generics/generic_parameters_test.cpp \
diff --git a/jbmc/unit/java-testing-utils/Makefile b/jbmc/unit/java-testing-utils/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   load_java_class.cpp \
   require_goto_statements.cpp \
   require_parse_tree.cpp \
diff --git a/src/analyses/Makefile b/src/analyses/Makefile
@@ -1,4 +1,5 @@
-SRC = ai.cpp \
+override SRC = \
+      ai.cpp \
       ai_domain.cpp \
       ai_history.cpp \
       call_graph.cpp \
diff --git a/src/ansi-c/Makefile b/src/ansi-c/Makefile
@@ -1,4 +1,5 @@
-SRC = allocate_objects.cpp \
+override SRC = \
+      allocate_objects.cpp \
       anonymous_member.cpp \
       ansi_c_convert_type.cpp \
       ansi_c_declaration.cpp \
diff --git a/src/assembler/Makefile b/src/assembler/Makefile
@@ -1,4 +1,5 @@
-SRC = assembler_lex.yy.cpp \
+override SRC = \
+      assembler_lex.yy.cpp \
       assembler_parser.cpp \
       remove_asm.cpp \
       # Empty last line
diff --git a/src/cbmc/Makefile b/src/cbmc/Makefile
@@ -1,4 +1,5 @@
-SRC = c_test_input_generator.cpp \
+override SRC = \
+      c_test_input_generator.cpp \
       cbmc_languages.cpp \
       cbmc_main.cpp \
       cbmc_parse_options.cpp \
diff --git a/src/cpp/Makefile b/src/cpp/Makefile
@@ -1,4 +1,5 @@
-SRC = cpp_constructor.cpp \
+override SRC = \
+      cpp_constructor.cpp \
       cpp_convert_type.cpp \
       cpp_declaration.cpp \
       cpp_declarator.cpp \
diff --git a/src/cprover/Makefile b/src/cprover/Makefile
@@ -1,4 +1,5 @@
-SRC = address_taken.cpp \
+override SRC = \
+      address_taken.cpp \
       axioms.cpp \
       bv_pointers_wide.cpp \
       c_safety_checks.cpp \
diff --git a/src/crangler/Makefile b/src/crangler/Makefile
@@ -1,4 +1,5 @@
-SRC = c_defines.cpp \
+override SRC = \
+      c_defines.cpp \
       c_lex.yy.cpp \
       c_wrangler.cpp \
       crangler_main.cpp \
diff --git a/src/goto-analyzer/Makefile b/src/goto-analyzer/Makefile
@@ -1,4 +1,5 @@
-SRC = goto_analyzer_languages.cpp \
+override SRC = \
+      goto_analyzer_languages.cpp \
       goto_analyzer_main.cpp \
       goto_analyzer_parse_options.cpp \
       taint_analysis.cpp \
diff --git a/src/goto-bmc/Makefile b/src/goto-bmc/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   goto_bmc_main.cpp \
   goto_bmc_parse_options.cpp \
   # Empty last line
diff --git a/src/goto-cc/Makefile b/src/goto-cc/Makefile
@@ -1,4 +1,5 @@
-SRC = armcc_cmdline.cpp \
+override SRC = \
+      armcc_cmdline.cpp \
       armcc_mode.cpp \
       as86_cmdline.cpp \
       as_cmdline.cpp \
diff --git a/src/goto-checker/Makefile b/src/goto-checker/Makefile
@@ -1,4 +1,5 @@
-SRC = bmc_util.cpp \
+override SRC = \
+      bmc_util.cpp \
       counterexample_beautification.cpp \
       cover_goals_report_util.cpp \
       fatal_assertions.cpp \
diff --git a/src/goto-diff/Makefile b/src/goto-diff/Makefile
@@ -1,4 +1,5 @@
-SRC = change_impact.cpp \
+override SRC = \
+      change_impact.cpp \
       goto_diff_base.cpp \
       goto_diff_languages.cpp \
       goto_diff_main.cpp \
diff --git a/src/goto-harness/Makefile b/src/goto-harness/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   function_call_harness_generator.cpp \
   goto_harness_generator.cpp \
   goto_harness_generator_factory.cpp \
diff --git a/src/goto-inspect/Makefile b/src/goto-inspect/Makefile
@@ -1,4 +1,5 @@
-SRC = goto_inspect_main.cpp \
+override SRC = \
+      goto_inspect_main.cpp \
       goto_inspect_parse_options.cpp \
       # Empty last line
 
diff --git a/src/goto-instrument/Makefile b/src/goto-instrument/Makefile
@@ -1,4 +1,5 @@
-SRC = accelerate/accelerate.cpp \
+override SRC = \
+      accelerate/accelerate.cpp \
       accelerate/acceleration_utils.cpp \
       accelerate/all_paths_enumerator.cpp \
       accelerate/cone_of_influence.cpp \
diff --git a/src/goto-programs/Makefile b/src/goto-programs/Makefile
@@ -1,4 +1,5 @@
-SRC = adjust_float_expressions.cpp \
+override SRC = \
+      adjust_float_expressions.cpp \
       class_hierarchy.cpp \
       class_identifier.cpp \
       compute_called_functions.cpp \
diff --git a/src/goto-symex/Makefile b/src/goto-symex/Makefile
@@ -1,4 +1,5 @@
-SRC = auto_objects.cpp \
+override SRC = \
+      auto_objects.cpp \
       build_goto_trace.cpp \
       expr_skeleton.cpp \
       field_sensitivity.cpp \
diff --git a/src/goto-synthesizer/Makefile b/src/goto-synthesizer/Makefile
@@ -1,4 +1,5 @@
-SRC = cegis_evaluator.cpp \
+override SRC = \
+      cegis_evaluator.cpp \
       cegis_verifier.cpp \
       dump_loop_contracts.cpp \
       enumerative_loop_contracts_synthesizer.cpp \
diff --git a/src/json-symtab-language/Makefile b/src/json-symtab-language/Makefile
@@ -1,4 +1,5 @@
-SRC = json_goto_function.cpp \
+override SRC = \
+      json_goto_function.cpp \
       json_goto_functions.cpp \
       json_symtab_language.cpp \
       json_symbol_table.cpp \
diff --git a/src/json/Makefile b/src/json/Makefile
@@ -1,4 +1,5 @@
-SRC = json_interface.cpp \
+override SRC = \
+      json_interface.cpp \
       json_lex.yy.cpp \
       json_parser.cpp \
       json_y.tab.cpp \
diff --git a/src/langapi/Makefile b/src/langapi/Makefile
@@ -1,4 +1,5 @@
-SRC = language_util.cpp \
+override SRC = \
+      language_util.cpp \
       language_file.cpp \
       language.cpp \
       mode.cpp \
diff --git a/src/libcprover-cpp/Makefile b/src/libcprover-cpp/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   api.cpp \
   api_options.cpp \
   verification_result.cpp \
diff --git a/src/linking/Makefile b/src/linking/Makefile
@@ -1,4 +1,5 @@
-SRC = casting_replace_symbol.cpp \
+override SRC = \
+      casting_replace_symbol.cpp \
       linking.cpp \
       linking_diagnostics.cpp \
       remove_internal_symbols.cpp \
diff --git a/src/memory-analyzer/Makefile b/src/memory-analyzer/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   analyze_symbol.cpp \
   gdb_api.cpp \
   memory_analyzer_main.cpp \
diff --git a/src/pointer-analysis/Makefile b/src/pointer-analysis/Makefile
@@ -1,4 +1,5 @@
-SRC = add_failed_symbols.cpp \
+override SRC = \
+      add_failed_symbols.cpp \
       goto_program_dereference.cpp \
       show_value_sets.cpp \
       value_set.cpp \
diff --git a/src/solvers/Makefile b/src/solvers/Makefile
@@ -69,7 +69,8 @@ ifneq ($(CADICAL),)
   CLEANFILES += $(CADICAL_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(CADICAL_LIB))
 endif
 
-SRC = $(BOOLEFORCE_SRC) \
+override SRC = \
+      $(BOOLEFORCE_SRC) \
       $(CHAFF_SRC) \
       $(CUDD_SRC) \
       $(GLUCOSE_SRC) \
diff --git a/src/statement-list/Makefile b/src/statement-list/Makefile
@@ -1,4 +1,5 @@
-SRC = converters/convert_bool_literal.cpp \
+override SRC = \
+      converters/convert_bool_literal.cpp \
       converters/convert_dint_literal.cpp \
       converters/convert_int_literal.cpp \
       converters/convert_real_literal.cpp \
diff --git a/src/symtab2gb/Makefile b/src/symtab2gb/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   symtab2gb_main.cpp \
   symtab2gb_parse_options.cpp \
   # Empty last line
diff --git a/src/util/Makefile b/src/util/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
       algebraic_number.cpp \
       arith_tools.cpp \
       array_element_from_pointer.cpp \
diff --git a/src/xmllang/Makefile b/src/xmllang/Makefile
@@ -1,4 +1,5 @@
-SRC = graphml.cpp \
+override SRC = \
+      graphml.cpp \
       xml_interface.cpp \
       xml_lex.yy.cpp \
       xml_parse_tree.cpp \
diff --git a/unit/Makefile b/unit/Makefile
@@ -1,11 +1,9 @@
 .PHONY: all cprover.dir test testing-utils-clean
 
 # Source files for test utilities
-SRC = unit_tests.cpp \
-      # Empty last line
-
-# Test source files
-SRC += analyses/ai/ai.cpp \
+override SRC = \
+       unit_tests.cpp \
+       analyses/ai/ai.cpp \
        analyses/ai/ai_simplify_lhs.cpp \
        analyses/call_graph.cpp \
        analyses/constant_propagator.cpp \
diff --git a/unit/testing-utils/Makefile b/unit/testing-utils/Makefile
@@ -1,4 +1,4 @@
-SRC = \
+override SRC = \
   call_graph_test_utils.cpp \
   free_form_cmdline.cpp \
   get_goto_model_from_c.cpp \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SRC = \`
	`1`	`+override SRC = \`
`2`	`2`	`load_java_class.cpp \`
`3`	`3`	`require_goto_statements.cpp \`
`4`	`4`	`require_parse_tree.cpp \`