#if defined (__aarch64__)
#define ARCHITECTURE_IDENTIFIER "arm64"
+const static std::vector<std::string> RID_FALLBACK_GRAPH =
+ {"linux-arm64", "linux", "unix-arm64", "unix", "any", "base"};
+
#elif defined (__arm__)
#define ARCHITECTURE_IDENTIFIER "arm"
+const static std::vector<std::string> RID_FALLBACK_GRAPH =
+ {"tizen.4.0.0-armel", "tizen.4.0.0", "tizen-armel", "tizen", "linux-armel", "linux", "unix-armel", "unix", "any", "base"};
+
#elif defined (__x86_64__)
#define ARCHITECTURE_IDENTIFIER "x64"
+const static std::vector<std::string> RID_FALLBACK_GRAPH =
+ {"linux-x64", "linux", "unix-x64", "unix", "any", "base"};
+
#elif defined (__i386__)
#define ARCHITECTURE_IDENTIFIER "x86"
+const static std::vector<std::string> RID_FALLBACK_GRAPH =
+ {"linux-x86", "linux", "unix-x86", "unix", "any", "base"};
+
#else
-#define ARCHITECTURE_IDENTIFIER "unknown"
+#error "Unknown target"
#endif
static std::string getExtraNativeLibDirs(const std::string& appRoot)
{
- // auto generated directory by nuget will be considered later
- std::string candidate = concatPath(appRoot, "lib/" ARCHITECTURE_IDENTIFIER);
+ std::string candidate;
+ for (int i = 0; i < RID_FALLBACK_GRAPH.size(); i++) {
+ if(!candidate.empty()) {
+ candidate += ":";
+ }
+ candidate += concatPath(appRoot, "bin/runtimes/" + RID_FALLBACK_GRAPH[i] + "/native");
+ }
+
+ candidate = candidate + ":" + concatPath(appRoot, "lib/" ARCHITECTURE_IDENTIFIER);
if (!strncmp(ARCHITECTURE_IDENTIFIER, "arm64", 5)) {
candidate = candidate + ":" + concatPath(appRoot, "lib/aarch64");
}
assembliesInDirectory(searchDirectories, tpa);
std::string nativeLibPath;
- nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appLib + ":" + appBin + ":" + __nativeLibDirectory;
+ nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory;
std::string appName = std::string("dotnet-launcher-") + std::to_string(getpid());
if (!initializeCoreClr(appName.c_str(), probePath.c_str(), nativeLibPath.c_str(), tpa.c_str())) {