diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-06 15:34:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 15:34:33 +0000 |
| commit | 47a1c9652657ba963be2f8fb1760f75dc33e2301 (patch) | |
| tree | 296f5ef738d86b2f932f3e6a393659e51172a89f | |
| parent | 07293bc30afb6abc016db793b3deeec75f20e205 (diff) | |
| parent | 06d2d0c6ef9ec8d14f3423d0ddf5e17e444cdc02 (diff) | |
| download | podman-47a1c9652657ba963be2f8fb1760f75dc33e2301.tar.gz podman-47a1c9652657ba963be2f8fb1760f75dc33e2301.tar.bz2 podman-47a1c9652657ba963be2f8fb1760f75dc33e2301.zip | |
Merge pull request #8260 from mbargull/check-scripts-env-cc
Use CPP, CC and flags in dep check scripts
| -rwxr-xr-x | hack/btrfs_installed_tag.sh | 2 | ||||
| -rwxr-xr-x | hack/btrfs_tag.sh | 2 | ||||
| -rwxr-xr-x | hack/libdm_tag.sh | 2 | ||||
| -rwxr-xr-x | hack/systemd_tag.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hack/btrfs_installed_tag.sh b/hack/btrfs_installed_tag.sh index c4d99f377..f2f2b33c8 100755 --- a/hack/btrfs_installed_tag.sh +++ b/hack/btrfs_installed_tag.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cc -E - > /dev/null 2> /dev/null << EOF +${CPP:-${CC:-cc} -E} ${CPPFLAGS} - > /dev/null 2> /dev/null << EOF #include <btrfs/ioctl.h> EOF if test $? -ne 0 ; then diff --git a/hack/btrfs_tag.sh b/hack/btrfs_tag.sh index 59cb969ad..ea753d4d0 100755 --- a/hack/btrfs_tag.sh +++ b/hack/btrfs_tag.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cc -E - > /dev/null 2> /dev/null << EOF +${CPP:-${CC:-cc} -E} ${CPPFLAGS} - > /dev/null 2> /dev/null << EOF #include <btrfs/version.h> EOF if test $? -ne 0 ; then diff --git a/hack/libdm_tag.sh b/hack/libdm_tag.sh index d3668aab1..815b5d914 100755 --- a/hack/libdm_tag.sh +++ b/hack/libdm_tag.sh @@ -2,7 +2,7 @@ tmpdir="$PWD/tmp.$RANDOM" mkdir -p "$tmpdir" trap 'rm -fr "$tmpdir"' EXIT -cc -o "$tmpdir"/libdm_tag -ldevmapper -x c - > /dev/null 2> /dev/null << EOF +${CC:-cc} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o "$tmpdir"/libdm_tag -x c - -ldevmapper > /dev/null 2> /dev/null << EOF #include <libdevmapper.h> int main() { struct dm_task *task; diff --git a/hack/systemd_tag.sh b/hack/systemd_tag.sh index 19a7bf6a6..5af322881 100755 --- a/hack/systemd_tag.sh +++ b/hack/systemd_tag.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cc -E - > /dev/null 2> /dev/null << EOF +${CPP:-${CC:-cc} -E} ${CPPFLAGS} - > /dev/null 2> /dev/null << EOF #include <systemd/sd-daemon.h> EOF if test $? -eq 0 ; then |