Emscripten: adapt to new package layout (emscripten-git in AUR).

mosra · Jun 29, 2014 · 7380270 · 7380270
1 parent 19d1e7e
commit 7380270
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/generic/Emscripten.cmake b/generic/Emscripten.cmake
@@ -13,19 +13,16 @@
 
 set(CMAKE_SYSTEM_NAME Emscripten)
 
-set(EMSCRIPTEN_PREFIX "/usr/emscripten")
-
 # Spoonfeed CMakeFindBinUtils.cmake, as explicitly set CMAKE_AR/CMAKE_RANLIB
 # would get overwritten with empty string
 set(_CMAKE_TOOLCHAIN_PREFIX em)
 set(_CMAKE_TOOLCHAIN_LOCATION ${EMSCRIPTEN_PREFIX})
 
-set(EMSCRIPTEN_TOOLCHAIN_PATH "${EMSCRIPTEN_PREFIX}/system")
-set(CMAKE_C_COMPILER "${EMSCRIPTEN_PREFIX}/emcc")
-set(CMAKE_CXX_COMPILER "${EMSCRIPTEN_PREFIX}/em++")
+set(EMSCRIPTEN_TOOLCHAIN_PATH "/usr/lib/emscripten/system")
+set(CMAKE_C_COMPILER "emcc")
+set(CMAKE_CXX_COMPILER "em++")
 set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH}
-    "${EMSCRIPTEN_TOOLCHAIN_PATH}"
-    "${EMSCRIPTEN_PREFIX}")
+    "${EMSCRIPTEN_TOOLCHAIN_PATH}")
 
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)