darlinghq/darling-installer
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-installer.git synced 2024-11-23 11:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt build to updated libc++

Browse Source
This commit is contained in:
Lubos Dolezel 2017-03-27 20:48:26 +02:00
parent 4929db6f7b
commit 0aa29e3906
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,6 +10,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -nostdinc -nostdinc++ -std=c++11")
add_definitions(-DRECEIPTS_DIR="/private/var/db/receipts") add_definitions(-DRECEIPTS_DIR="/private/var/db/receipts")
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/external/libcxx/include)
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/src/external/libxml2/include ${CMAKE_SOURCE_DIR}/src/external/libxml2/include
${CMAKE_BINARY_DIR}/src/external/libxml2/include ${CMAKE_BINARY_DIR}/src/external/libxml2/include
@ -18,7 +19,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/libc/fbsdcompat ${CMAKE_SOURCE_DIR}/src/libc/fbsdcompat
${CMAKE_SOURCE_DIR}/src/libc/include/FreeBSD ${CMAKE_SOURCE_DIR}/src/libc/include/FreeBSD
${CMAKE_SOURCE_DIR}/src/external/liblzma/src/liblzma/api ${CMAKE_SOURCE_DIR}/src/external/liblzma/src/liblzma/api
${CMAKE_SOURCE_DIR}/src/external/libcxx/include
${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/common ${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/common
${CMAKE_SOURCE_DIR}/src/external/corefoundation ${CMAKE_SOURCE_DIR}/src/external/corefoundation
${CMAKE_SOURCE_DIR}/src/external/foundation/include ${CMAKE_SOURCE_DIR}/src/external/foundation/include

2
src/pkg/Installer.cpp
View File

@ -410,7 +410,7 @@ const char* Installer::getPackageName()
return m_subdir; return m_subdir;
else else
{ {
char* p; const char* p;
p = strrchr(m_pkg, '/'); p = strrchr(m_pkg, '/');
if (p != nullptr) if (p != nullptr)