don't use -g, causes relocation error in object files

petersalomonsen · Dec 17, 2023 · 16e19d9 · 16e19d9
1 parent 603d564
commit 16e19d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/wasibuild/build.sh b/wasibuild/build.sh
@@ -9,5 +9,5 @@ fi
 
 clang --target=wasm32-wasi --sysroot=wasi-sdk-20.0/share/wasi-sysroot -D_WASI_EMULATED_MMAN -Iwasi_mocks -c wasi_mocks/pwd.c -o wasi_mocks/pwd.o
 cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/wasi_toolchain.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_FLAGS="$EXTRA_CMAKE_C_FLAGS" -DREGEX_BACKEND=regcomp -DSONAME=OFF -DUSE_HTTPS=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_THREADS=OFF -DUSE_SSH=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=ON ../libgit2
-make lg2
+make lg2 VERBOSE=1
 
diff --git a/wasibuild/wasi_toolchain.cmake b/wasibuild/wasi_toolchain.cmake
@@ -1,13 +1,16 @@
 SET(CMAKE_C_COMPILER   clang)
 SET(CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}/wasi-sdk-20.0/share/wasi-sysroot/)
 SET(CMAKE_SYSROOT ${CMAKE_CURRENT_LIST_DIR}/wasi-sdk-20.0/share/wasi-sysroot/)
-set(CMAKE_C_FLAGS "--target=wasm32-wasi -I${CMAKE_CURRENT_LIST_DIR}/wasi_mocks -D_WASI_EMULATED_MMAN -lwasi-emulated-mman ${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "--target=wasm32-wasi -I${CMAKE_CURRENT_LIST_DIR}/wasi_mocks -D_WASI_EMULATED_MMAN ${CMAKE_C_FLAGS}")
 
 set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/include")
 
+set(CMAKE_C_FLAGS_DEBUG "")
+
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_AR "llvm-ar" CACHE FILEPATH "llvm-ar")
 set(CMAKE_RANLIB "llvm-ranlib" CACHE FILEPATH "llvm-ranlib")
 
+set(CMAKE_EXE_LINKER_FLAGS "-lwasi-emulated-mman ${CMAKE_EXE_LINKER_FLAGS}")