summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-08-03 06:48:14 (GMT)
committerTony Theodore <tonyt@logyst.com>2016-08-11 13:02:05 (GMT)
commit1ebd0b563ab48149f995f4854da0f84ddcdb05d8 (patch)
treed31cd90b1ae9a1ae1c3432916c5a9793c42be6bb
parent4374d5b3c6e1d00be98b33637f112d07c09b858c (diff)
downloadmxe-1ebd0b563ab48149f995f4854da0f84ddcdb05d8.zip
mxe-1ebd0b563ab48149f995f4854da0f84ddcdb05d8.tar.gz
mxe-1ebd0b563ab48149f995f4854da0f84ddcdb05d8.tar.bz2
libical: use BUILD_DIR etc.
-rw-r--r--src/libical.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libical.mk b/src/libical.mk
index 658f564..825c979 100644
--- a/src/libical.mk
+++ b/src/libical.mk
@@ -14,14 +14,14 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- cd '$(1)' && mkdir build
- cd '$(1)/build' && cmake .. \
- -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+ cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
-DUSE_BUILTIN_TZDATA=true \
- -DSTATIC_ONLY=$(if $(BUILD_STATIC),true,false) \
- -DSHARED_ONLY=$(if $(BUILD_STATIC),false,true)
- $(MAKE) -C '$(1)/build' -j '$(JOBS)'
- $(MAKE) -C '$(1)/build' -j 1 install
+ -DSTATIC_ONLY=$(CMAKE_STATIC_BOOL) \
+ -DSHARED_ONLY=$(CMAKE_SHARED_BOOL) \
+ '$(SOURCE_DIR)'
+
+ $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \