diff options
| author | Anthony Green <green@moxielogic.com> | 2019-10-14 13:06:49 -0400 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2019-10-14 13:06:49 -0400 |
| commit | 462b92670d791fae573c088594c09931516843a0 (patch) | |
| tree | cac3d2deb0d77cbaa6748f4f8590ac8f4bfa1eb0 | |
| parent | 8857351b8979930d6fbb3403a2ec8f1ef1d25247 (diff) | |
| download | libffi-462b92670d791fae573c088594c09931516843a0.tar.gz | |
More build fixes
| -rwxr-xr-x | .travis/build.sh | 2 | ||||
| -rw-r--r-- | testsuite/lib/libffi.exp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis/build.sh b/.travis/build.sh index c6a001c..c0571a5 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -25,7 +25,7 @@ function build_linux() function build_foreign_linux() { - docker run --rm -t -i -v /usr/bin/qemu-$1-static:/usr/bin/qemu-$1-static -v `pwd`:/opt --rm -ti -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 /opt/.travis/build-in-container.sh + docker run --rm -t -i -v `pwd`:/opt --rm -ti -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 /opt/.travis/build-in-container.sh } function build_ios() diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp index 77d6414..ba411ab 100644 --- a/testsuite/lib/libffi.exp +++ b/testsuite/lib/libffi.exp @@ -482,7 +482,7 @@ proc run-many-tests { testcases extra_flags } { "clang" { set common "-W -Wall" if [info exists env(LIBFFI_TEST_OPTIMIZATION)] { - set optimizations { $env(LIBFFI_TEST_OPTIMIZATION) } + set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ] } else { set optimizations { "-O0" "-O2" } } @@ -490,7 +490,7 @@ proc run-many-tests { testcases extra_flags } { "gnu" { set common "-W -Wall -Wno-psabi" if [info exists env(LIBFFI_TEST_OPTIMIZATION)] { - set optimizations { $env(LIBFFI_TEST_OPTIMIZATION) } + set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ] } else { set optimizations { "-O0" "-O2" "-O2 -fomit-frame-pointer" } } @@ -499,7 +499,7 @@ proc run-many-tests { testcases extra_flags } { # Assume we are using the vendor compiler. set common "" if [info exists env(LIBFFI_TEST_OPTIMIZATION)] { - set optimizations { $env(LIBFFI_TEST_OPTIMIZATION) } + set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ] } else { set optimizations { "" } } |