Update libafl-libfuzzer build scripts with more options (#3358)

Co-authored-by: Rowan Hart <[email protected]>

Author: novafacing

crates/libafl_libfuzzer_runtime/build.ps1

@@ -1,19 +1,37 @@
 #!/usr/bin/env pwsh
+param (
+    [Parameter(Mandatory = $false, HelpMessage = "The build profile to use, e.g. 'release' or 'dev'. Default is 'release'.")]
+    [string]$Profile = "release",
+    [Parameter(Mandatory = $false, HelpMessage = "The toolchain to use, e.g. 'stable', 'nightly', etc. Default is 'stable'.")]
+    [string]$Toolchain = "stable",
+    [Parameter(Mandatory = $false, HelpMessage = "Additional cargo arguments to pass")]
+    [string]$CargoArgs = "",
+    [Parameter(Mandatory = $false, HelpMessage = "Additional rustc arguments to pass")]
+    [string]$RustcArgs = "",
+    [Parameter(Mandatory = $false, HelpMessage = "Additional flags to set for the C compiler")]
+    [string]$CCFlags = ""
+)
 
 $ErrorActionPreference = "Stop"
 
 $SCRIPT_DIR = Split-Path -Parent $MyInvocation.MyCommand.Path
 
 Set-Location $SCRIPT_DIR
 
-if ($args.Count -eq 0) {
-    $profile = "release"
-} else {
-    $profile = $args[0]
+Write-Host "Building libafl_libfuzzer runtime with profile '$Profile' on toolchain '$Toolchain'" -ForegroundColor Green
+Invoke-Command -ScriptBlock {
+    $env:RUSTFLAGS = $RustcArgs
+    $env:CFLAGS = $CCFlags
+    Write-Host "Using Rust flags: $env:RUSTFLAGS" -ForegroundColor Cyan
+    Write-Host "Using Cargo arguments: $CargoArgs" -ForegroundColor Cyan
+    Write-Host "Using C compiler flags: $env:CFLAGS" -ForegroundColor Cyan
+    if ($CargoArgs) {
+        cargo +$Toolchain build --profile $Profile $CargoArgs
+    } else {
+        cargo +$Toolchain build --profile $Profile
+    }
 }
 
-Write-Host "Building libafl_libfuzzer runtime with profile '$profile'" -ForegroundColor Green
-Invoke-Expression "cargo build --profile $profile"
 
 $tmpdir = Join-Path $env:TEMP ([System.IO.Path]::GetRandomFileName())
 New-Item -ItemType Directory -Path $tmpdir | Out-Null
@@ -25,13 +43,13 @@ function Cleanup {
 }
 
 try {
-    if ($profile -eq "dev") {
+    if ($Profile -eq "dev") {
         # Set the profile to debug for dev builds, because the path isn't the same
         # as the profile name
-        $profile = "debug"
+        $Profile = "debug"
     }
 
-    $targetPath = Join-Path $SCRIPT_DIR "target\$profile\afl_libfuzzer_runtime.lib"
+    $targetPath = Join-Path $SCRIPT_DIR "target\$Profile\afl_libfuzzer_runtime.lib"
     $outputPath = Join-Path $SCRIPT_DIR "libFuzzer.lib"
 
     Copy-Item -Path $targetPath -Destination $outputPath -Force | Out-Null

crates/libafl_libfuzzer_runtime/build.rs

@@ -19,6 +19,11 @@ fn main() {
 
     let mut harness_wrap = cc::Build::new();
 
+    if let Ok(flags) = env::var("CFLAGS") {
+        println!("cargo:rerun-if-env-changed=CFLAGS");
+        harness_wrap.flags(flags.split_whitespace());
+    }
+
     harness_wrap.cpp(true).file("src/harness_wrap.cpp");
 
     harness_wrap.compile("harness_wrap");

crates/libafl_libfuzzer_runtime/build.sh

@@ -6,18 +6,85 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 cd "${SCRIPT_DIR}" || exit 1
 
-if [ -z ${1+x} ]; then
-  profile=release
-else
-  profile="$1"
+#!/bin/bash
+
+# Default values
+profile="release"
+toolchain="nightly"
+cargoargs=""
+rustcargs=""
+ccompilerflags=""
+
+# Help message
+print_help() {
+  echo "Usage: $0 [options]"
+  echo
+  echo "Options:"
+  echo "  -p, --profile         Build profile to use (default: release)"
+  echo "  -t, --toolchain       Toolchain to use (default: nightly)"
+  echo "  -c, --cargo-args      Additional cargo arguments to pass"
+  echo "  -r, --rustc-args      Additional rustc arguments to pass"
+  echo "  -f, --cc-flags        Additional flags to set for the C compiler"
+  echo "  -h, --help            Show this help message and exit"
+  echo
+  echo "Example:"
+  echo "  $0 --profile dev --toolchain nightly --cargo-args \"--verbose\" --rustc-args \"--emit asm\" --cc-flags \"-O2\""
+}
+
+# Use getopt for long options
+OPTIONS=$(getopt -o p:t:c:r:f:h --long profile:,toolchain:,cargo-args:,rustc-args:,cc-flags:,help -- "$@")
+if [ $? -ne 0 ]; then
+  echo "Invalid options provided"
+  exit 1
 fi
+eval set -- "$OPTIONS"
+
+# Parse options
+while true; do
+  case "$1" in
+    -p|--profile)
+      profile="$2"
+      shift 2
+      ;;
+    -t|--toolchain)
+      toolchain="$2"
+      shift 2
+      ;;
+    -c|--cargo-args)
+      cargoargs="$2"
+      shift 2
+      ;;
+    -r|--rustc-args)
+      rustcargs="$2"
+      shift 2
+      ;;
+    -f|--cc-flags)
+      ccompilerflags="$2"
+      shift 2
+      ;;
+    -h|--help)
+      print_help
+      exit 0
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      echo "Unexpected option: $1"
+      exit 1
+      ;;
+  esac
+done
 
-if ! cargo +nightly --version >& /dev/null; then
+if ! cargo +$toolchain --version >& /dev/null; then
   echo -e "You must install a recent Rust to build the libafl_libfuzzer runtime!"
   exit 1
 fi
 
-cargo +nightly build --profile "$profile"
+export RUSTFLAGS="${RUSTFLAGS} ${rustcargs}"
+export CFLAGS="${CFLAGS} ${ccompilerflags}"
+cargo +$toolchain build --profile "$profile" ${cargoargs}
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   # MacOS and iOS
@@ -26,7 +93,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     -o libafl_libfuzzer_runtime.dylib
 else
   # Linux and *BSD
-  RUSTC_BIN="$(cargo +nightly rustc -Zunstable-options --print target-libdir)/../bin"
+  RUSTC_BIN="$(cargo +$toolchain rustc -Zunstable-options --print target-libdir)/../bin"
   RUST_LLD="${RUSTC_BIN}/rust-lld"
   RUST_AR="${RUSTC_BIN}/llvm-ar"