Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
7956064f
"vscode:/vscode.git/clone" did not exist on "ff6a4830162880da66b181c26166459e7e761aa1"
Commit
7956064f
authored
Nov 08, 2017
by
xoviat
Committed by
GitHub
Nov 08, 2017
Browse files
Revert "[osx_steps] export cppflags"
This reverts commit
4f303070
.
parent
4f303070
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
tests/test_library_builders.sh
tests/test_library_builders.sh
+1
-1
travis_steps.sh
travis_steps.sh
+0
-4
No files found.
tests/test_library_builders.sh
View file @
7956064f
...
...
@@ -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
...
...
travis_steps.sh
View file @
7956064f
...
...
@@ -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
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment