Fix linux build

innative-sdk · May 15, 2019 · 10bfe8e · 10bfe8e
1 parent e362617
commit 10bfe8e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -44,22 +44,25 @@ install: all
 dist: all
 	mkdir -p innative-posix-redist-x64/
 	cp bin/innative.a innative-posix-redist-x64/
-	cp bin/innative.so innative-posix-redist-x64/
+	cp bin/libinnative.so innative-posix-redist-x64/
 	cp bin/innative-env.a innative-posix-redist-x64/
 	cp bin/innative-env-d.a innative-posix-redist-x64/
 	cp bin/innative-cmd innative-posix-redist-x64/
 	tar -czf innative-posix-redist-x64.tar.gz innative-posix-redist-x64/
 	mkdir -p innative-posix-sdk-x64/bin/
-	mkdir -p innative-posix-sdk-x64/include/
+	mkdir -p innative-posix-sdk-x64/include/innative/
 	mkdir -p innative-posix-sdk-x64/scripts/
 	mkdir -p innative-posix-sdk-x64/spec/test/core/
-  mv innative-posix-redist-x64/ innative-posix-sdk-x64/bin/
+	mv innative-posix-redist-x64/* innative-posix-sdk-x64/bin/
+	rm -r innative-posix-redist-x64/
 	cp bin/innative-test innative-posix-sdk-x64/bin/
-  cp include/ innative-posix-sdk-x64/include/
-  cp scripts/*.wat innative-posix-sdk-x64/scripts/
-  cp scripts/*.wasm innative-posix-sdk-x64/scripts/
-  cp spec/test/core/ innative-posix-sdk-x64/spec/test/core/
-
+	cp include/innative/*.h innative-posix-sdk-x64/include/innative/
+	cp scripts/*.wat innative-posix-sdk-x64/scripts/
+	cp scripts/*.wasm innative-posix-sdk-x64/scripts/
+	cp spec/test/core/* innative-posix-sdk-x64/spec/test/core/
+	tar -czf innative-posix-sdk-x64.tar.gz innative-posix-sdk-x64/
+	rm -r innative-posix-sdk-x64/
+
 uninstall:
 	$(RM) -r $(DESTDIR)$(PREFIX)/include/innative
 	$(RM) $(DESTDIR)$(PREFIX)/lib/libinnative.so

diff --git a/build-llvm.sh b/build-llvm.sh
@@ -10,6 +10,9 @@ if [ $# -gt 0 ] && [ "$1" = "ninja" ]; then
   ninja
 else
   CORES=$(nproc --all)
+  if [ -z "$CORES" ]; then
+    CORES=1
+  fi
   echo "Using Make with" $CORES "cores"
   cmake ../../llvm -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE:STRING="MinSizeRel" -DLLVM_TARGETS_TO_BUILD:STRING="X86;WebAssembly" -DLLVM_BUILD_LLVM_DYLIB:BOOL=OFF -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON -DLLVM_INCLUDE_EXAMPLES:BOOL=OFF -DLLVM_INCLUDE_TESTS:BOOL=OFF -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF -DLLVM_APPEND_VC_REV:BOOL=OFF
   make -j $CORES

diff --git a/innative/Makefile b/innative/Makefile
@@ -24,7 +24,7 @@ innative-clean:
 
 $(LIBDIR)/libinnative.so: $(LIBDIR)/innative-env.a $(LIBDIR)/innative-env_d.a $(INNATIVE_OBJS)
 	$(CXXLD) $(INNATIVE_CPPFLAGS) $(INNATIVE_OBJS) $(INNATIVE_LDFLAGS) -shared -o $@
-    
+
 $(LIBDIR)/innative.a: $(LIBDIR)/innative-env.a $(LIBDIR)/innative-env_d.a $(INNATIVE_OBJS)
 	$(AR) rcs $@ $(INNATIVE_OBJS)