Remove dependency in libgphobos in built artifacts.

Dadoum · Jul 31, 2022 · 629baa2 · 629baa2
1 parent 609d15e
commit 629baa2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/cmake-cross-compile.yml b/.github/workflows/cmake-cross-compile.yml
@@ -1,4 +1,4 @@
-name: CMake
+name: aarch64 builds
 
 on:
   push:

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -1,4 +1,4 @@
-name: CMake
+name: x86_64 builds
 
 on:
   push:
@@ -41,7 +41,6 @@ jobs:
           ${{github.workspace}}/build/libprovision-java.so
           ${{github.workspace}}/build/retrieve_headers
           ${{github.workspace}}/build/sideload_ipa
-
   build-anisette-server:
     runs-on: ubuntu-20.04
 
@@ -95,3 +94,4 @@ jobs:
         with:
           name: retrieve-headers-debug
           path: ${{github.workspace}}/build/retrieve_headers
+
diff --git a/toolchains/rpi-4-no-suffix.cmake b/toolchains/rpi-4-no-suffix.cmake
@@ -27,7 +27,7 @@ SET(COMPILER_ROOT ${RASPBERRY_ROOT_PATH})
 
 SET(CMAKE_PREFIX_PATH ${RASPBERRY_ROOT_PATH})
 
-SET(CMAKE_D_FLAGS "${CMAKE_D_FLAGS} -l:libgphobos.a -fall-instantiations" CACHE INTERNAL "" FORCE)
+SET(CMAKE_D_FLAGS "${CMAKE_D_FLAGS} -defaultlib=:libgphobos.a -fall-instantiations" CACHE INTERNAL "" FORCE)
 # SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH}" CACHE INTERNAL "" FORCE)
 # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH}" CACHE INTERNAL "" FORCE)
 # SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH}" CACHE INTERNAL "" FORCE)

diff --git a/toolchains/rpi-4.cmake b/toolchains/rpi-4.cmake
@@ -27,7 +27,7 @@ SET(COMPILER_ROOT ${RASPBERRY_ROOT_PATH})
 
 SET(CMAKE_PREFIX_PATH ${RASPBERRY_ROOT_PATH})
 
-SET(CMAKE_D_FLAGS "${CMAKE_D_FLAGS} -l:libgphobos.a -fall-instantiations" CACHE INTERNAL "" FORCE)
+SET(CMAKE_D_FLAGS "${CMAKE_D_FLAGS} -defaultlib=:libgphobos.a -fall-instantiations" CACHE INTERNAL "" FORCE)
 # SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH}" CACHE INTERNAL "" FORCE)
 # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH}" CACHE INTERNAL "" FORCE)
 # SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH}" CACHE INTERNAL "" FORCE)