passenger 6.2.0 → 6.2.2

data/build/agent.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -91,20 +91,18 @@ AGENT_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    lambda { {
-      include_paths: [
-        "src/agent",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS,
-      ],
-      flags: [
-        agent_cflags,
-        libev_cflags,
-        libuv_cflags,
-        PlatformInfo.curl_flags,
-        PlatformInfo.openssl_extra_cflags,
-        PlatformInfo.zlib_flags,
-      ],
-    } }
+    include_paths: [
+      "src/agent",
+      *CXX_SUPPORTLIB_INCLUDE_PATHS,
+    ],
+    flags: -> { [
+      agent_cflags,
+      libev_cflags,
+      libuv_cflags,
+      PlatformInfo.curl_flags,
+      PlatformInfo.openssl_extra_cflags,
+      PlatformInfo.zlib_flags,
+    ] }
   )
 end
 

data/build/apache2.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -74,25 +74,21 @@ APACHE2_OBJECTS.each_pair do |object, source|
     define_c_object_compilation_task(
       object,
       source,
-      lambda { {
-        include_paths: [
-          "src/agent",
-          *CXX_SUPPORTLIB_INCLUDE_PATHS,
-        ],
-        flags: apache2_cflags,
-      } }
+      include_paths: [
+        "src/agent",
+        *CXX_SUPPORTLIB_INCLUDE_PATHS,
+      ],
+      flags: -> { apache2_cflags }
     )
   else
     define_cxx_object_compilation_task(
       object,
       source,
-      lambda { {
-        include_paths: [
-          "src/agent",
-          *CXX_SUPPORTLIB_INCLUDE_PATHS,
-        ],
-        flags: apache2_cxxflags,
-      } }
+      include_paths: [
+        "src/agent",
+        *CXX_SUPPORTLIB_INCLUDE_PATHS,
+      ],
+      flags: -> { apache2_cxxflags }
     )
   end
 end
@@ -126,7 +122,8 @@ file(APACHE2_TARGET => dependencies) do
       PlatformInfo.apache2_module_cxx_ldflags,
       PlatformInfo.portability_cxx_ldflags,
       OPTIMIZE ? '-O' : nil,
-      USE_ASAN ? PlatformInfo.address_sanitizer_flags : nil,
+      USE_ASAN ? PlatformInfo.address_sanitizer_cxx_ldflags : nil,
+      USE_UBSAN ? PlatformInfo.undefined_behavior_sanitizer_cxx_ldflags : nil,
     ].compact
   )
 end

data/build/basics.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -33,6 +33,7 @@ PhusionPassenger.locate_directories
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'packaging'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
@@ -114,20 +115,16 @@ EXTRA_PRE_CXXFLAGS = compiler_flag_option('EXTRA_PRE_CXXFLAGS')
 let(:extra_cflags) do
   result = PlatformInfo.default_extra_cflags.dup
   result << " " << compiler_flag_option('EXTRA_CFLAGS') if !compiler_flag_option('EXTRA_CFLAGS').empty?
-  result << " #{PlatformInfo.address_sanitizer_flags}" if USE_ASAN && PlatformInfo.address_sanitizer_flags
-  result << " #{PlatformInfo.undefined_behavior_sanitizer_flags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_flags
-  result << " -fno-omit-frame-pointer" if USE_ASAN
-  result << " -fno-optimize-sibling-calls" if USE_ASAN && PlatformInfo.cc_supports_fno_optimize_sibling_calls_flag?
+  result << " #{PlatformInfo.address_sanitizer_cflags}" if USE_ASAN && PlatformInfo.address_sanitizer_cflags
+  result << " #{PlatformInfo.undefined_behavior_sanitizer_cflags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_cflags
   result << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
   result
 end
 let(:extra_cxxflags) do
   result = PlatformInfo.default_extra_cxxflags.dup
   result << " " << compiler_flag_option('EXTRA_CXXFLAGS') if !compiler_flag_option('EXTRA_CXXFLAGS').empty?
-  result << " #{PlatformInfo.address_sanitizer_flags}" if USE_ASAN && PlatformInfo.address_sanitizer_flags
-  result << " #{PlatformInfo.undefined_behavior_sanitizer_flags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_flags
-  result << " -fno-omit-frame-pointer" if USE_ASAN
-  result << " -fno-optimize-sibling-calls" if USE_ASAN && PlatformInfo.cxx_supports_fno_optimize_sibling_calls_flag?
+  result << " #{PlatformInfo.address_sanitizer_cxxflags}" if USE_ASAN && PlatformInfo.address_sanitizer_cxxflags
+  result << " #{PlatformInfo.undefined_behavior_sanitizer_cxxflags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_cxxflags
   result << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
   result
 end
@@ -141,8 +138,8 @@ EXTRA_PRE_CXX_LDFLAGS = compiler_flag_option('EXTRA_PRE_LDFLAGS') + " " +
 # These should be included last in the command string, even after portability_*_ldflags.
 let(:extra_c_ldflags) do
   result = []
-  result << PlatformInfo.address_sanitizer_flags if USE_ASAN
-  result << PlatformInfo.undefined_behavior_sanitizer_flags if USE_UBSAN
+  result << PlatformInfo.address_sanitizer_c_ldflags if USE_ASAN
+  result << PlatformInfo.undefined_behavior_sanitizer_c_ldflags if USE_UBSAN
   result << compiler_flag_option('EXTRA_LDFLAGS')
   result << compiler_flag_option('EXTRA_C_LDFLAGS')
   result.compact!
@@ -150,8 +147,8 @@ let(:extra_c_ldflags) do
 end
 let(:extra_cxx_ldflags) do
   result = []
-  result << PlatformInfo.address_sanitizer_flags if USE_ASAN
-  result << PlatformInfo.undefined_behavior_sanitizer_flags if USE_UBSAN
+  result << PlatformInfo.address_sanitizer_cxx_ldflags if USE_ASAN
+  result << PlatformInfo.undefined_behavior_sanitizer_cxx_ldflags if USE_UBSAN
   result << compiler_flag_option('EXTRA_LDFLAGS')
   result << compiler_flag_option('EXTRA_CXX_LDFLAGS')
   result.compact!

data/build/common_library.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -56,10 +56,8 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
     define_cxx_object_compilation_task(
       object_file,
       source_file,
-      lambda { {
-        include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
-        flags: [ optimize, maybe_eval_lambda(extra_compiler_flags) ],
-      } }
+      include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
+      flags: -> { [ optimize, maybe_eval_lambda(extra_compiler_flags) ] }
     )
   end
 
@@ -74,10 +72,8 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
     define_cxx_object_compilation_task(
       object_file,
       source_file,
-      lambda { {
-        include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
-        flags: [ optimize, maybe_eval_lambda(extra_compiler_flags) ],
-      } }
+      include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
+      flags: -> { [ optimize, maybe_eval_lambda(extra_compiler_flags) ] }
     )
   end
 

data/build/cxx_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -105,6 +105,8 @@ TEST_CXX_OBJECTS = {
     "test/cxx/DataStructures/StringMapTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/FileTools/PathSecurityCheckTest.o" =>
     "test/cxx/FileTools/PathSecurityCheckTest.cpp",
+  "#{TEST_OUTPUT_DIR}cxx/InstanceDirectoryTest.o" =>
+    "test/cxx/InstanceDirectoryTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/IOTools/MessageSerializationTest.o" =>
     "test/cxx/IOTools/MessageSerializationTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/StaticStringTest.o" =>
@@ -190,11 +192,9 @@ TEST_CXX_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    lambda { {
-      include_paths: test_cxx_include_paths,
-      flags: test_cxx_flags,
-      deps: "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}",
-    } }
+    include_paths: -> { test_cxx_include_paths },
+    flags: -> { test_cxx_flags },
+    deps: -> { "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}" }
   )
 end
 
@@ -293,15 +293,42 @@ task 'test:cxx' => cxx_test_dependencies do
   end
 end
 
-file("test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}" => generate_compilation_task_dependencies('test/cxx/TestSupport.h')) do
-  compile_cxx(
-    "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}",
+cxx_test_support_deps = generate_compilation_task_dependencies('test/cxx/TestSupport.h')
+file("test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}" => cxx_test_support_deps) do
+  target = "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}"
+  # Need for CCACHE_EXTRAFILES:
+  # Macro definition changes (most notably in Constants.h) may not properly invalidate
+  # compiler caches. This is because compiler caches use the preprocessed output (like
+  # gcc -E) as cache key. This output does not contain unexpanded macro definitions, but
+  # the resulting precompiled header *does*. So a change in Constants.h might trigger a
+  # cache hit when recompiling the precompiled header, resulting in users of the
+  # precompiled headers to get stale Constants.h macro definitions.
+  #
+  # Known issue with ccache, affects sccache too:
+  # https://github.com/ccache/ccache/issues/1686
+  #
+  # One possible fix is to skip caching when compiling precompiled headers
+  # CCACHE_RECACHE=1.
+  #
+  # We've chosen a softer approach that allows more cachability: setting
+  # CCACHE_EXTRAFILES to all transitive includes, so that their full
+  # contents are used in the cache keys. This allows caching when dependencies
+  # have been merely touched, or when reverting to previous contents.
+  #
+  # Note: sccache does not support caching precompiled headers at all, so no issues there.
+
+  compile_cxx(target,
     'test/cxx/TestSupport.h',
+    environment: {
+      'CCACHE_EXTRAFILES' => cxx_test_support_deps.join(':'),
+    },
     include_paths: test_cxx_include_paths,
     flags: [
       "-x c++-header",
-      PlatformInfo.cxx_is_clang? ? "-Xclang -emit-pch" : nil,
+      # sccache keys on preprocessed output, which drops #define lines. Without -dD, changing
+      # only a macro (e.g. a new constant in Constants.h) would hit a stale precompiled header.
+      PlatformInfo.cxx_is_gcc? ? "-dD" : nil,
+      PlatformInfo.cxx_is_clang? ? "-Xclang -emit-pch -Xclang -fno-pch-timestamp" : nil,
       basic_test_cxx_flags,
-    ].compact.flatten
-  )
+    ].compact.flatten)
 end

data/build/integration_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -43,7 +43,10 @@ task 'test:integration:apache2' => dependencies do
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
-  if grep = string_option('E')
+  if (loc = string_option('LOC'))
+    command << " #{shesc(loc)}"
+  end
+  if (grep = string_option('E'))
     command << " -e #{shesc grep}"
   end
   sh "cd test && exec #{command}"

data/build/misc.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/build/nginx.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/build/node_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2025 Asynchronous B.V.
+#  Copyright (c) 2013-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/build/oxt_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -38,13 +38,11 @@ TEST_OXT_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    lambda { {
-      include_paths: [
-        "test/support",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS,
-      ],
-      flags: TEST_COMMON_CFLAGS,
-    } }
+    include_paths: [
+      "test/support",
+      *CXX_SUPPORTLIB_INCLUDE_PATHS,
+    ],
+    flags: TEST_COMMON_CFLAGS
   )
 end
 

data/build/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/build/ruby_extension.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/build/ruby_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/build/schema_printer.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -44,20 +44,18 @@ SCHEMA_PRINTER_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    lambda { {
-      include_paths: [
-        "src/agent",
-        *CXX_SUPPORTLIB_INCLUDE_PATHS,
-      ],
-      flags: [
-        agent_cflags,
-        libev_cflags,
-        libuv_cflags,
-        PlatformInfo.curl_flags,
-        PlatformInfo.openssl_extra_cflags,
-        PlatformInfo.zlib_flags,
-      ],
-    } }
+    include_paths: [
+      "src/agent",
+      *CXX_SUPPORTLIB_INCLUDE_PATHS,
+    ],
+    flags: -> { [
+      agent_cflags,
+      libev_cflags,
+      libuv_cflags,
+      PlatformInfo.curl_flags,
+      PlatformInfo.openssl_extra_cflags,
+      PlatformInfo.zlib_flags,
+    ] }
   )
 end
 

data/build/support/cplusplus.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2025 Asynchronous B.V.
+#  Copyright (c) 2010-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.
@@ -24,29 +24,33 @@
 
 # Rake functions for compiling/linking C++ stuff.
 
-def run_compiler(*command)
-  PhusionPassenger.require_passenger_lib 'utils/ansi_colors' if !defined?(PhusionPassenger::Utils::AnsiColors)
-  show_command = command.join(' ')
+def run_compiler(*command, environment: {})
+  environment = maybe_eval_lambda(environment) || {}
+  environment = environment.transform_keys(&:to_s).transform_values(&:to_s)
+  environment_display = environment.map do |name, value|
+    "#{name}=#{Shellwords.escape(value)}"
+  end
+  show_command = (environment_display + command).join(' ')
   puts show_command
-  if !system(*command)
+  if !system(environment, *command)
     colors = PhusionPassenger::Utils::AnsiColors.new
     if $? && $?.exitstatus == 4
       # This probably means the compiler ran out of memory.
-      msg = "<b>" +
-            "-----------------------------------------------\n" +
-            "Your compiler failed with the exit status 4. This " +
-            "probably means that it ran out of memory. To solve " +
-            "this problem, try increasing your swap space: " +
-            "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
+      msg = "<b>" \
+            "-----------------------------------------------\n" \
+            "Your compiler failed with the exit status 4. This " \
+            "probably means that it ran out of memory. To solve " \
+            "this problem, try increasing your swap space: " \
+            "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" \
             "</b>"
       fail(colors.ansi_colorize(msg))
     elsif $? && $?.termsig == 9
       msg = "<b>" +
-            "-----------------------------------------------\n" +
-            "Your compiler was killed by the operating system. This " +
-            "probably means that it ran out of memory. To solve " +
-            "this problem, try increasing your swap space: " +
-            "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
+            "-----------------------------------------------\n" \
+            "Your compiler was killed by the operating system. This " \
+            "probably means that it ran out of memory. To solve " \
+            "this problem, try increasing your swap space: " \
+            "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" \
             "</b>"
       fail(colors.ansi_colorize(msg))
     else
@@ -55,67 +59,54 @@ def run_compiler(*command)
   end
 end
 
-def build_compiler_flags_from_options_or_flags(options_or_flags)
-  if options_or_flags.is_a?(Hash)
-    result = []
-    options = options_or_flags
+def build_compiler_flags(include_paths: [], flags: [])
+  result = []
 
-    (options[:include_paths] || []).each do |path|
-      result << "-I#{path}"
-    end
-
-    if flags = options[:flags]
-      result.concat([ flags ].flatten)
-    end
-
-    result.flatten.reject { |x| x.nil? || x.empty? }.join(" ")
-  elsif options_or_flags.is_a?(String)
-    options_or_flags
-  elsif options_or_flags.respond_to?(:call)
-    build_compiler_flags_from_options_or_flags(options_or_flags.call)
-  elsif options_or_flags.nil?
-    ""
-  else
-    raise ArgumentError, "Invalid argument type: #{options_or_flags.inspect}"
+  (maybe_eval_lambda(include_paths) || []).each do |path|
+    result << "-I#{path}"
   end
+
+  result.concat([ maybe_eval_lambda(flags) ].flatten)
+  result.flatten.reject { |x| x.nil? || x.empty? }.join(" ")
 end
 
-def generate_compilation_task_dependencies(source, options = nil)
+def generate_compilation_task_dependencies(source, deps: [])
   result = [ source ]
-  if dependencies = CXX_DEPENDENCY_MAP[source]
+  if (dependencies = CXX_DEPENDENCY_MAP[source])
     result.concat(dependencies)
   end
-  options = maybe_eval_lambda(options)
-  if options && options[:deps]
-    result.concat([ options[:deps] ].flatten.compact)
-  end
+  result.concat([ maybe_eval_lambda(deps) ].flatten.compact)
   result
 end
 
-def compile_c(object, source, options_or_flags = nil)
-  flags = build_compiler_flags_from_options_or_flags(options_or_flags)
+def compile_c(object, source, environment: {}, include_paths: [], flags: [])
+  flags = build_compiler_flags(include_paths: include_paths, flags: flags)
   ensure_target_directory_exists(object)
-  run_compiler("#{cc} -o #{object} #{EXTRA_PRE_CFLAGS} #{flags} #{extra_cflags} -c #{source}")
+  run_compiler("#{cc} -o #{object} #{EXTRA_PRE_CFLAGS} #{flags} #{extra_cflags} -c #{source}",
+    environment: environment)
 end
 
-def compile_cxx(object, source, options_or_flags = nil)
-  flags = build_compiler_flags_from_options_or_flags(options_or_flags)
+def compile_cxx(object, source, environment: {}, include_paths: [], flags: [])
+  flags = build_compiler_flags(include_paths: include_paths, flags: flags)
   ensure_target_directory_exists(object)
-  run_compiler("#{cxx} -o #{object} #{EXTRA_PRE_CXXFLAGS} #{flags} #{extra_cxxflags} -c #{source}")
+  run_compiler("#{cxx} -o #{object} #{EXTRA_PRE_CXXFLAGS} #{flags} #{extra_cxxflags} -c #{source}",
+    environment: environment)
 end
 
-def create_c_executable(target, objects, options_or_flags = nil)
+def create_c_executable(target, objects, environment: {}, flags: [])
   objects = [ objects ].flatten.join(" ")
-  flags = build_compiler_flags_from_options_or_flags(options_or_flags)
+  flags = build_compiler_flags(flags: flags)
   ensure_target_directory_exists(target)
-  run_compiler("#{cc} -o #{target} #{objects} #{EXTRA_PRE_C_LDFLAGS} #{flags} #{extra_c_ldflags}")
+  run_compiler("#{cc} -o #{target} #{objects} #{EXTRA_PRE_C_LDFLAGS} #{flags} #{extra_c_ldflags}",
+    environment: environment)
 end
 
-def create_cxx_executable(target, objects, options_or_flags = nil)
+def create_cxx_executable(target, objects, environment: {}, flags: [])
   objects = [ objects ].flatten.join(" ")
-  flags = build_compiler_flags_from_options_or_flags(options_or_flags)
+  flags = build_compiler_flags(flags: flags)
   ensure_target_directory_exists(target)
-  run_compiler("#{cxx} -o #{target} #{objects} #{EXTRA_PRE_CXX_LDFLAGS} #{flags} #{extra_cxx_ldflags}")
+  run_compiler("#{cxx} -o #{target} #{objects} #{EXTRA_PRE_CXX_LDFLAGS} #{flags} #{extra_cxx_ldflags}",
+    environment: environment)
 end
 
 def create_static_library(target, objects)
@@ -132,7 +123,7 @@ def create_static_library(target, objects)
   sh "ranlib #{target}"
 end
 
-def create_shared_library(target, objects, options_or_flags = nil)
+def create_shared_library(target, objects, environment: {}, flags: [])
   if PlatformInfo.os_name_simple == "macosx"
     shlib_flag = "-flat_namespace -bundle -undefined dynamic_lookup"
   else
@@ -144,29 +135,30 @@ def create_shared_library(target, objects, options_or_flags = nil)
     fPIC = "-fPIC"
   end
   objects = [ objects ].flatten.join(" ")
-  flags = build_compiler_flags_from_options_or_flags(options_or_flags)
+  flags = build_compiler_flags(flags: flags)
   ensure_target_directory_exists(target)
-  run_compiler("#{cxx} #{shlib_flag} #{objects} #{fPIC} -o #{target} #{flags}")
+  run_compiler("#{cxx} #{shlib_flag} #{objects} #{fPIC} -o #{target} #{flags}",
+    environment: environment)
 end
 
-def define_c_object_compilation_task(object, source, options_or_flags = nil)
-  options = options_or_flags if options_or_flags.is_a?(Hash) || options_or_flags.respond_to?(:call)
-  file(object => generate_compilation_task_dependencies(source, options)) do
-    compile_c(object, source, options_or_flags)
+def define_c_object_compilation_task(object, source, environment: {}, include_paths: [], flags: [], deps: [])
+  file(object => generate_compilation_task_dependencies(source, deps: deps)) do
+    compile_c(object, source, environment: environment, include_paths: include_paths, flags: flags)
   end
 end
 
-def define_cxx_object_compilation_task(object, source, options_or_flags = nil)
-  options = options_or_flags if options_or_flags.is_a?(Hash) || options_or_flags.respond_to?(:call)
-  file(object => generate_compilation_task_dependencies(source, options)) do
-    compile_cxx(object, source, options_or_flags)
+def define_cxx_object_compilation_task(object, source, environment: {}, include_paths: [], flags: [], deps: [])
+  file(object => generate_compilation_task_dependencies(source, deps: deps)) do
+    compile_cxx(object, source, environment: environment, include_paths: include_paths, flags: flags)
   end
 end
 
-def define_c_or_cxx_object_compilation_task(object, source, options_or_flags = nil)
+def define_c_or_cxx_object_compilation_task(object, source, environment: {}, include_paths: [], flags: [], deps: [])
   if source =~ /\.c$/
-    define_c_object_compilation_task(object, source, options_or_flags)
+    define_c_object_compilation_task(object, source,
+      environment: environment, include_paths: include_paths, flags: flags, deps: deps)
   else
-    define_cxx_object_compilation_task(object, source, options_or_flags)
+    define_cxx_object_compilation_task(object, source,
+      environment: environment, include_paths: include_paths, flags: flags, deps: deps)
   end
 end