From c254e1178b0d7ba68740929ee412bb0c9ee108ab Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 24 Apr 2020 07:04:34 +0000 Subject: [PATCH] ide/Builders: OpenBSD support in CreateBuildMethods git-svn-id: svn://ultimatepp.org/upp/trunk@14362 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Builders/Install.cpp | 14 ++++++++++++-- uppsrc/umk/umake.cpp | 1 - 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/uppsrc/ide/Builders/Install.cpp b/uppsrc/ide/Builders/Install.cpp index d338a1e2a..64394addf 100644 --- a/uppsrc/ide/Builders/Install.cpp +++ b/uppsrc/ide/Builders/Install.cpp @@ -96,14 +96,24 @@ void CreateBuildMethods() if(IsNull(LoadFile(bm))) SaveFile(bm, clang_bm); #else + bool openbsd = ToLower(Sys("uname")).Find("openbsd") >= 0; + auto Fix = [=](const char *s) { + String r = s; + if(openbsd) { + r.Replace("INCLUDE = \"\";", "INCLUDE = \"/usr/local/include\";"); + r.Replace("LIB = \"\";", "LIB = \"/usr/local/lib\";"); + } + return r; + }; + String bm = ConfigFile("GCC.bm"); if(IsNull(LoadFile(bm))) - SaveFile(bm, gcc_bm); + SaveFile(bm, Fix(gcc_bm)); if(Sys("clang --version").GetCount()) { String bm = ConfigFile("CLANG.bm"); if(IsNull(LoadFile(bm))) - SaveFile(bm, clang_bm); + SaveFile(bm, Fix(clang_bm)); } #endif } diff --git a/uppsrc/umk/umake.cpp b/uppsrc/umk/umake.cpp index e724eb848..ea5b9bfd5 100644 --- a/uppsrc/umk/umake.cpp +++ b/uppsrc/umk/umake.cpp @@ -59,7 +59,6 @@ String GetAndroidSDKPath() CONSOLE_APP_MAIN { - #ifdef PLATFORM_POSIX setlinebuf(stdout); CreateBuildMethods();