Merge pull request #154 from snowball-lang/revert-152-dev

Revert "Make repo a flake and make ld-linux be dynamically located"

.gitignore

@@ -69,8 +69,4 @@ install_manifest.txt
 compile_commands.json
 callgrind.out.*
 
-install_deps_temp/
-
-.direnv
-result
-.cmake
+install_deps_temp/

CMakeLists.txt

@@ -258,7 +258,12 @@ if (DEFINED ENV{BUILD_FOR_CE})
   add_compile_definitions(_SNOWBALL_BUILD_FOR_CE="1")
 endif()
 
-add_compile_definitions(LD_PATH="ld")
+if (${BUILD_FOR_WIN})
+  add_compile_definitions(LD_PATH="ld")
+else()
+  add_compile_definitions(LD_PATH="/usr/bin/ld")
+endif()
+
 
 add_compile_definitions(STATICLIB_DIR="${STATICLIB_DIR}")
 
@@ -348,4 +353,4 @@ install(TARGETS snowballexe EXPORT MyLibConfig
 # TODO: as a feature:
 # install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
-#install(FILES ${std_sn_files} DESTINATION ${HOME_DIR}/${STATICLIB_DIR}/${_SNOWBALL_LIBRARY_DIR})
+#install(FILES ${std_sn_files} DESTINATION ${HOME_DIR}/${STATICLIB_DIR}/${_SNOWBALL_LIBRARY_DIR})

src/builder/linker/linux/ld.cc

@@ -4,7 +4,6 @@
 #include "../../../constants.h"
 #include "../Linker.h"
 
-#include <dlfcn.h>
 #include <filesystem>
 namespace fs = std::filesystem;
 
@@ -31,25 +30,12 @@ void Linker::constructLinkerArgs(std::string& input, std::string& output, std::v
   if (ctx->withStd) {
     // TODO: check if this works for all platforms
     linkerArgs.push_back("-dynamic-linker");
-
-    fs::path ld_linux_path;
-
-    void* handle = dlopen("ld-linux-x86-64.so.2", RTLD_LAZY);
-    if (!handle) { DEBUG_CODEGEN("Error getting library path: %s", dlerror()); }
-
-    Dl_info info;
-    if (dladdr(handle, &info)) {
-      ld_linux_path = info.dli_fname;
-    } else {
-      DEBUG_CODEGEN("Error getting library path: %s", dlerror());
-    }
-
-    linkerArgs.push_back(ld_linux_path);
+    linkerArgs.push_back("/lib64/ld-linux-x86-64.so.2");
 
     auto path = std::string("/usr") + PATH_SEPARATOR + _SNOWBALL_LIBRARY_OBJ;
     auto triple = getPlatformTriple();
     assert(!triple.empty() && "Unsupported platform for linking!");
-    auto platformPath = ld_linux_path.parent_path();
+    auto platformPath = fs::path(path) / triple;
     linkerArgs.push_back(platformPath / "crt1.o");
     linkerArgs.push_back(platformPath / "crti.o");
     if (!isIAMCU) {
@@ -98,4 +84,4 @@ std::string Linker::getSharedLibraryName(std::string& library) { return library
 } // namespace linker
 } // namespace snowball
 
-#endif
+#endif