Migrate static-pie scripts to rmake

This commit is contained in:
Jerry Wang 2024-06-19 20:58:56 -04:00
parent f90d4e4371
commit c69770d730
No known key found for this signature in database
GPG Key ID: B9657729C5192EDC
3 changed files with 30 additions and 43 deletions

View File

@ -1,20 +0,0 @@
#!/bin/bash
set -euo pipefail
if command -v clang > /dev/null
then
CLANG_VERSION=$(echo __clang_major__ | clang -E -x c - | grep -v -e '^#' )
echo "clang version $CLANG_VERSION detected"
if (( $CLANG_VERSION >= 9 ))
then
echo "clang supports -static-pie"
exit 0
else
echo "clang too old to support -static-pie, skipping test"
exit 1
fi
else
echo "No clang version detected"
exit 2
fi

View File

@ -1,20 +0,0 @@
#!/bin/bash
set -euo pipefail
if command -v gcc > /dev/null
then
GCC_VERSION=$(echo __GNUC__ | gcc -E -x c - | grep -v -e '^#' )
echo "gcc version $GCC_VERSION detected"
if (( $GCC_VERSION >= 8 ))
then
echo "gcc supports -static-pie"
exit 0
else
echo "gcc too old to support -static-pie, skipping test"
exit 1
fi
else
echo "No gcc version detected"
exit 2
fi

View File

@ -8,13 +8,40 @@
use std::process::Command;
use run_make_support::llvm_readobj;
use run_make_support::regex::Regex;
use run_make_support::rustc;
use run_make_support::{cmd, run_with_args, target};
fn ok_compiler_version(compiler: &str) -> bool {
let check_file = format!("check_{compiler}_version.sh");
// Minimum major versions supporting -static-pie
const GCC_VERSION: u32 = 8;
const CLANG_VERSION: u32 = 9;
Command::new(check_file).status().is_ok_and(|status| status.success())
// Return `true` if the `compiler` version supports `-static-pie`.
fn ok_compiler_version(compiler: &str) -> bool {
let (trigger, version_threshold) = match compiler {
"clang" => ("__clang_major__", CLANG_VERSION),
"gcc" => ("__GNUC__", GCC_VERSION),
other => panic!("unexpected compiler '{other}', expected 'clang' or 'gcc'"),
};
if Command::new(compiler).spawn().is_err() {
eprintln!("No {compiler} version detected");
return false;
}
let compiler_output =
cmd(compiler).stdin(trigger).arg("-").arg("-E").arg("-x").arg("c").run().stdout_utf8();
let re = Regex::new(r"(?m)^(\d+)").unwrap();
let version: u32 =
re.captures(&compiler_output).unwrap().get(1).unwrap().as_str().parse().unwrap();
if version >= version_threshold {
eprintln!("{compiler} supports -static-pie");
true
} else {
eprintln!("{compiler} too old to support -static-pie, skipping test");
false
}
}
fn test(compiler: &str) {