Merge pull request #70 from matthew-brett/revert-67-flags

Revert "[osx_steps] export cppflags"

Merge pull request #70 from matthew-brett/revert-67-flags
Revert "[osx_steps] export cppflags"
6302112b · xoviat · GitHub · 4f303070 · 7956064f · 6302112b
Unverified Commit 6302112b authored Nov 08, 2017 by xoviat Committed by GitHub Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

tests/test_library_builders.sh tests/test_library_builders.sh +1 -1

travis_steps.sh travis_steps.sh +0 -4

No files found.
--- a/tests/test_library_builders.sh
+++ b/tests/test_library_builders.sh
@@ -21,7 +21,7 @@ function suppress {
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi

 suppress build_openssl
-suppress build_libpng
+suppress build_openblas
 suppress build_libwebp
 suppress build_szip
 suppress build_swig

--- a/travis_steps.sh
+++ b/travis_steps.sh
@@ -10,7 +10,3 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 else
    source $MULTIBUILD_DIR/travis_linux_steps.sh
 fi
-
-# Promote BUILD_PREFIX on search path to find new zlib
-export CPPFLAGS="-L$BUILD_PREFIX/include $CPPFLAGS"
-export LDFLAGS="-L$BUILD_PREFIX/lib $LDFLAGS"