diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ac8f86ec0..38ba79ae5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,7 +107,8 @@ jobs: services: - docker before_install: - - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash + # TODO: Emscripten upstream produces a broken build in CI environments only :( + - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten-fastcomp bash script: # run binaryen.js tests before and after building, so we see if the bundled # version is good too diff --git a/CMakeLists.txt b/CMakeLists.txt index 4efd24c85..d66bd22a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,7 +185,7 @@ else() if(WIN32) add_compile_flag("-D_GNU_SOURCE") add_link_flag("-Wl,--stack,8388608") - else() + elseif(NOT EMSCRIPTEN) add_compile_flag("-fPIC") endif() add_debug_compile_flag("-O0") |