Last active
May 8, 2016 22:21
-
-
Save borgdylan/29afc3d623aea5de80fd5cb688c269eb to your computer and use it in GitHub Desktop.
Java.Interop - Linux x64 build
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 7ded1ec..764744d 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -55,7 +55,7 @@ run-all-tests: run-tests run-test-jnimarshal run-test-generator-core run-ptests | |
clean: | |
-$(XBUILD) /t:Clean | |
-rm -Rf bin/$(CONFIGURATION) bin/Build$(CONFIGURATION) bin/Test$(CONFIGURATION) bin/XAIntegration$(CONFIGURATION) | |
- -rm src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config | |
+ -rm -f src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config | |
include build-tools/scripts/jdk.mk | |
include build-tools/scripts/mono.mk | |
diff --git a/build-tools/scripts/jdk.mk b/build-tools/scripts/jdk.mk | |
index ab041f2..19fc4d2 100644 | |
--- a/build-tools/scripts/jdk.mk | |
+++ b/build-tools/scripts/jdk.mk | |
@@ -91,10 +91,10 @@ endif # Darwin | |
ifeq ($(OS),Linux) | |
# This is for Ubuntu and derivatives (possibly Debian too) | |
-_LINUX_JAVA_INCLUDE_DIRS = /usr/lib/jvm/default-java/include/ | |
+_LINUX_JAVA_INCLUDE_DIRS = /usr/lib/jvm/default-java/include | |
_LINUX_JAVA_FALLBACK_DIRS = /usr/lib/jvm/java* | |
_LINUX_JAVA_JNI_INCLUDE_DIR = include | |
-_LINUX_JAVA_JNI_OS_INCLUDE_DIR = $(DESKTOP_JAVA_JNI_INCLUDE_DIR)/linux | |
+_LINUX_JAVA_JNI_OS_INCLUDE_DIR = $(DESKTOP_JAVA_JNI_INCLUDE_DIR)/include/linux | |
ifeq ($(wildcard $(DESKTOP_JAVA_INCLUDE_DIRS)),) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment