Pass runtime headers via '-I' flag

JetBrains · Aug 13, 2018 · fb6e410 · fb6e410
1 parent 84d1b5a
commit fb6e410
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 17 deletions.
diff --git a/libclangext/build.gradle b/libclangext/build.gradle
@@ -39,7 +39,9 @@ model {
                 }
             }
             binaries.withType(StaticLibraryBinarySpec) { binary ->
-                cppCompiler.args "--std=c++11", "-g", "-fPIC", "-I${llvmDir}/include"
+                if (!project.parent.convention.plugins.platformInfo.isWindows())
+                    cppCompiler.args "-fPIC"
+                cppCompiler.args "--std=c++11", "-g", "-I${llvmDir}/include"
                 if (isEnabled) {
                     cppCompiler.args '-DLIBCLANGEXT_ENABLE=1'
                 }

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -28,6 +28,7 @@ targetList.each { targetName ->
 	    if (!isWindows())
 	       compilerArgs '-fPIC'
         compilerArgs '-I' + project.file('../common/src/hash/headers')
+        compilerArgs '-I' + file('src/main/cpp')
         if (rootProject.hasProperty("${targetName}LibffiDir"))
             compilerArgs '-I' + project.file(rootProject.ext.get("${targetName}LibffiDir") + "/include")
         linkerArgs project.file("../common/build/$targetName/hash.bc").path

diff --git a/runtime/src/main/cpp/Arrays.cpp b/runtime/src/main/cpp/Arrays.cpp
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Exceptions.h"
 #include "Memory.h"
 #include "Natives.h"

diff --git a/runtime/src/main/cpp/Console.cpp b/runtime/src/main/cpp/Console.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Assert.h"
+#include "KAssert.h"
 #include "Memory.h"
 #include "Natives.h"
 #include "KString.h"

diff --git a/runtime/src/main/cpp/Exceptions.cpp b/runtime/src/main/cpp/Exceptions.cpp
@@ -33,7 +33,7 @@
 #endif
 #endif // OMIT_BACKTRACE
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Exceptions.h"
 #include "ExecFormat.h"
 #include "Memory.h"

diff --git a/runtime/src/main/cpp/ExecFormat.cpp b/runtime/src/main/cpp/ExecFormat.cpp
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include "Assert.h"
+#include "KAssert.h"
 
 namespace {
 
@@ -148,7 +148,7 @@ extern "C" bool AddressToSymbol(const void* address, char* resultBuffer, size_t
 #include <stdlib.h>
 #include <string.h>
 
-#include "Assert.h"
+#include "KAssert.h"
 
 namespace {
 

diff --git a/runtime/src/main/cpp/Assert.cpp → runtime/src/main/cpp/KAssert.cpp b/runtime/src/main/cpp/Assert.cpp → runtime/src/main/cpp/KAssert.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "KAssert.h"
 #include "Porting.h"
 
 void RuntimeAssertFailed(const char* location, const char* message) {

diff --git a/runtime/src/main/cpp/Assert.h → runtime/src/main/cpp/KAssert.h b/runtime/src/main/cpp/Assert.h → runtime/src/main/cpp/KAssert.h
diff --git a/runtime/src/main/cpp/KDebug.cpp b/runtime/src/main/cpp/KDebug.cpp
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Memory.h"
 #include "Natives.h"
 #include "Porting.h"

diff --git a/runtime/src/main/cpp/KString.cpp b/runtime/src/main/cpp/KString.cpp
@@ -15,7 +15,7 @@
  */
 #include <string.h>
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "City.h"
 #include "Exceptions.h"
 #include "Memory.h"

diff --git a/runtime/src/main/cpp/Memory.cpp b/runtime/src/main/cpp/Memory.cpp
@@ -20,7 +20,7 @@
 #include <cstddef> // for offsetof
 
 #include "Alloc.h"
-#include "Assert.h"
+#include "KAssert.h"
 #include "Atomic.h"
 #include "Exceptions.h"
 #include "Memory.h"

diff --git a/runtime/src/main/cpp/Memory.h b/runtime/src/main/cpp/Memory.h
@@ -17,7 +17,7 @@
 #ifndef RUNTIME_MEMORY_H
 #define RUNTIME_MEMORY_H
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Common.h"
 #include "TypeInfo.h"
 

diff --git a/runtime/src/main/cpp/Natives.cpp b/runtime/src/main/cpp/Natives.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Exceptions.h"
 #include "Memory.h"
 #include "Natives.h"

diff --git a/runtime/src/main/cpp/ObjCInterop.cpp b/runtime/src/main/cpp/ObjCInterop.cpp
@@ -218,7 +218,7 @@ Class Kotlin_objc_lookUpClass(const char* name) {
 
 #else  // KONAN_OBJC_INTEROP
 
-#include "Assert.h"
+#include "KAssert.h"
 
 extern "C" {
 

diff --git a/runtime/src/main/cpp/StdCppStubs.cpp b/runtime/src/main/cpp/StdCppStubs.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Porting.h"
 #include "Common.h"
 

diff --git a/runtime/src/main/cpp/ToString.cpp b/runtime/src/main/cpp/ToString.cpp
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "Exceptions.h"
 #include "Memory.h"
 #include "Natives.h"

diff --git a/runtime/src/main/cpp/TypeInfo.cpp b/runtime/src/main/cpp/TypeInfo.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "Assert.h"
+#include "KAssert.h"
 #include "TypeInfo.h"
 
 // If one shall use binary search when looking up methods and fields.

diff --git a/runtime/src/main/cpp/Utils.h b/runtime/src/main/cpp/Utils.h
@@ -15,7 +15,7 @@
  */
 
 #include <cstdint>
-#include "Assert.h"
+#include "KAssert.h"
 
 class SimpleMutex {
  private:

diff --git a/runtime/src/main/cpp/Worker.cpp b/runtime/src/main/cpp/Worker.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include "Alloc.h"
-#include "Assert.h"
+#include "KAssert.h"
 #include "Memory.h"
 #include "Runtime.h"
 #include "Types.h"