joakim-noah
7 years ago
committed by
Fredrik Fornwall
Fredrik Fornwall
6 changed files with 136 additions and 117 deletions
@ -1,68 +0,0 @@ |
|||||
diff --git a/cmake/Modules/FindLLVM.cmake b/cmake/Modules/FindLLVM.cmake
|
|
||||
index a6a0b0b7..06d6c1c1 100644
|
|
||||
--- a/cmake/Modules/FindLLVM.cmake
|
|
||||
+++ b/cmake/Modules/FindLLVM.cmake
|
|
||||
@@ -35,11 +35,12 @@ set(llvm_config_names llvm-config-5.0 llvm-config50
|
|
||||
llvm-config-3.8 llvm-config38 |
|
||||
llvm-config-3.7 llvm-config37 |
|
||||
llvm-config) |
|
||||
-find_program(LLVM_CONFIG
|
|
||||
- NAMES ${llvm_config_names}
|
|
||||
- PATHS ${LLVM_ROOT_DIR}/bin NO_DEFAULT_PATH
|
|
||||
- DOC "Path to llvm-config tool.")
|
|
||||
-find_program(LLVM_CONFIG NAMES ${llvm_config_names})
|
|
||||
+set(LLVM_CONFIG "/bin/ls")
|
|
||||
+#find_program(LLVM_CONFIG
|
|
||||
+# NAMES ${llvm_config_names}
|
|
||||
+# PATHS ${LLVM_ROOT_DIR}/bin NO_DEFAULT_PATH
|
|
||||
+# DOC "Path to llvm-config tool.")
|
|
||||
+#find_program(LLVM_CONFIG NAMES ${llvm_config_names})
|
|
||||
|
|
||||
# Prints a warning/failure message depending on the required/quiet flags. Copied |
|
||||
# from FindPackageHandleStandardArgs.cmake because it doesn't seem to be exposed. |
|
||||
@@ -175,12 +176,12 @@ else()
|
|
||||
endif() |
|
||||
endmacro() |
|
||||
|
|
||||
- llvm_set(VERSION_STRING version)
|
|
||||
- llvm_set(CXXFLAGS cxxflags)
|
|
||||
- llvm_set(HOST_TARGET host-target)
|
|
||||
- llvm_set(INCLUDE_DIRS includedir true)
|
|
||||
- llvm_set(ROOT_DIR prefix true)
|
|
||||
- llvm_set(ENABLE_ASSERTIONS assertion-mode)
|
|
||||
+ set(LLVM_VERSION_STRING "4.0.1")
|
|
||||
+ set(LLVM_CXXFLAGS "-I@TERMUX_PKG_SRC@/llvm/include -I@TERMUX_PKG_BUILD@/llvm/include -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wstring-conversion -Werror=date-time -std=c++11 -ffunction-sections -fdata-sections -O3 -DNDEBUG -fno-exceptions -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS")
|
|
||||
+ set(LLVM_HOST_TARGET "armv7-none-linux-android")
|
|
||||
+ set(LLVM_INCLUDE_DIRS "@TERMUX_PKG_SRC@/llvm/include")
|
|
||||
+ set(LLVM_ROOT_DIR "@TERMUX_PKG_BUILD@/llvm")
|
|
||||
+ set(LLVM_ENABLE_ASSERTIONS "OFF")
|
|
||||
|
|
||||
if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-8][\\.0-9A-Za-z]*") |
|
||||
# Versions below 3.9 do not support components debuginfocodeview, globalisel |
|
||||
@@ -207,13 +208,13 @@ else()
|
|
||||
list(REMOVE_ITEM LLVM_FIND_COMPONENTS "debuginfomsf" index) |
|
||||
endif() |
|
||||
|
|
||||
- llvm_set(LDFLAGS ldflags)
|
|
||||
+ set(LLVM_LIBRARY_DIRS "${LLVM_ROOT_DIR}/lib")
|
|
||||
+ set(LLVM_LDFLAGS "-L${LLVM_LIBRARY_DIRS}")
|
|
||||
# In LLVM 3.5+, the system library dependencies (e.g. "-lz") are accessed |
|
||||
# using the separate "--system-libs" flag. |
|
||||
- llvm_set(SYSTEM_LIBS system-libs)
|
|
||||
+ set(LLVM_SYSTEM_LIBS "-ldl -lncurses -lz -lm")
|
|
||||
string(REPLACE "\n" " " LLVM_LDFLAGS "${LLVM_LDFLAGS} ${LLVM_SYSTEM_LIBS}") |
|
||||
- llvm_set(LIBRARY_DIRS libdir true)
|
|
||||
- llvm_set_libs(LIBRARIES libs)
|
|
||||
+ set(LLVM_LIBRARIES "-lLLVMTableGen;-lLLVMLibDriver;-lLLVMOption;-lLLVMSymbolize;-lLLVMDebugInfoPDB;-lLLVMDebugInfoDWARF;-lLLVMAArch64Disassembler;-lLLVMAArch64CodeGen;-lLLVMAArch64AsmParser;-lLLVMAArch64Desc;-lLLVMAArch64Info;-lLLVMAArch64AsmPrinter;-lLLVMAArch64Utils;-lLLVMARMDisassembler;-lLLVMARMCodeGen;-lLLVMARMAsmParser;-lLLVMARMDesc;-lLLVMARMInfo;-lLLVMARMAsmPrinter;-lLLVMLineEditor;-lLLVMMIRParser;-lLLVMLTO;-lLLVMPasses;-lLLVMObjCARCOpts;-lLLVMOrcJIT;-lLLVMInterpreter;-lLLVMObjectYAML;-lLLVMX86Disassembler;-lLLVMX86AsmParser;-lLLVMX86CodeGen;-lLLVMGlobalISel;-lLLVMSelectionDAG;-lLLVMAsmPrinter;-lLLVMDebugInfoCodeView;-lLLVMDebugInfoMSF;-lLLVMCodeGen;-lLLVMX86Desc;-lLLVMMCDisassembler;-lLLVMX86Info;-lLLVMX86AsmPrinter;-lLLVMX86Utils;-lLLVMMCJIT;-lLLVMExecutionEngine;-lLLVMTarget;-lLLVMRuntimeDyld;-lgtest_main;-lgtest;-lLLVMCoroutines;-lLLVMipo;-lLLVMInstrumentation;-lLLVMVectorize;-lLLVMScalarOpts;-lLLVMLinker;-lLLVMIRReader;-lLLVMAsmParser;-lLLVMInstCombine;-lLLVMTransformUtils;-lLLVMBitWriter;-lLLVMAnalysis;-lLLVMCoverage;-lLLVMProfileData;-lLLVMObject;-lLLVMMCParser;-lLLVMMC;-lLLVMBitReader;-lLLVMCore;-lLLVMSupport;-lLLVMDemangle")
|
|
||||
# LLVM bug: llvm-config --libs tablegen returns -lLLVM-3.8.0 |
|
||||
# but code for it is not in shared library |
|
||||
if("${LLVM_FIND_COMPONENTS}" MATCHES "tablegen") |
|
||||
@@ -223,7 +224,7 @@ else()
|
|
||||
set(LLVM_LIBRARIES "${LLVM_LIBRARIES};-lLLVMTableGen") |
|
||||
endif() |
|
||||
endif() |
|
||||
- llvm_set(TARGETS_TO_BUILD targets-built)
|
|
||||
+ set(LLVM_TARGETS_TO_BUILD "AArch64 ARM X86")
|
|
||||
string(REGEX MATCHALL "${pattern}[^ ]+" LLVM_TARGETS_TO_BUILD ${LLVM_TARGETS_TO_BUILD}) |
|
||||
endif() |
|
||||
|
|
||||
@ -0,0 +1,106 @@ |
|||||
|
#!/bin/sh |
||||
|
show_help () { |
||||
|
echo "usage: llvm-config <OPTION>... [<COMPONENT>...] |
||||
|
|
||||
|
Get various configuration information needed to compile programs which use |
||||
|
LLVM. Typically called from 'configure' scripts. Examples: |
||||
|
llvm-config --cxxflags |
||||
|
llvm-config --ldflags |
||||
|
llvm-config --libs engine bcreader scalaropts |
||||
|
|
||||
|
Options: |
||||
|
--version Print LLVM version. |
||||
|
--prefix Print the installation prefix. |
||||
|
--src-root Print the source root LLVM was built from. |
||||
|
--obj-root Print the object root used to build LLVM. |
||||
|
--bindir Directory containing LLVM executables. |
||||
|
--includedir Directory containing LLVM headers. |
||||
|
--libdir Directory containing LLVM libraries. |
||||
|
--cppflags C preprocessor flags for files that include LLVM headers. |
||||
|
--cflags C compiler flags for files that include LLVM headers. |
||||
|
--cxxflags C++ compiler flags for files that include LLVM headers. |
||||
|
--ldflags Print Linker flags. |
||||
|
--system-libs System Libraries needed to link against LLVM components. |
||||
|
--libs Libraries needed to link against LLVM components. |
||||
|
--libnames Bare library names for in-tree builds. |
||||
|
--libfiles Fully qualified library filenames for makefile depends. |
||||
|
--components List of all possible components. |
||||
|
--targets-built List of all targets currently built. |
||||
|
--host-target Target triple used to configure LLVM. |
||||
|
--build-mode Print build mode of LLVM tree (e.g. Debug or Release). |
||||
|
--assertion-mode Print assertion mode of LLVM tree (ON or OFF). |
||||
|
--build-system Print the build system used to build LLVM (always cmake). |
||||
|
--has-rtti Print whether or not LLVM was built with rtti (YES or NO). |
||||
|
--has-global-isel Print whether or not LLVM was built with global-isel support (YES or NO). |
||||
|
--shared-mode Print how the provided components can be collectively linked (\`shared\` or \`static\`). |
||||
|
--link-shared Link the components as shared libraries. |
||||
|
--link-static Link the component libraries statically. |
||||
|
Typical components: |
||||
|
all All LLVM libraries (default). |
||||
|
engine Either a native JIT or a bitcode interpreter." |
||||
|
} |
||||
|
|
||||
|
arch=@TERMUX_ARCH@ |
||||
|
version=@LLVM_VERSION@ |
||||
|
prefix=@LLVM_BUILD_DIR@ |
||||
|
has_rtti=NO |
||||
|
CPPFLAGS="-I@TERMUX_PKG_SRCDIR@/llvm/include -I${prefix}/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" |
||||
|
CFLAGS="${CPPFLAGS} -Os -fPIC -Wall -W -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers" |
||||
|
CFLAGS="${CFLAGS} -pedantic -Wno-long-long -Wdelete-non-virtual-dtor -Werror=date-time -ffunction-sections" |
||||
|
CFLAGS="${CFLAGS} -fdata-sections -DNDEBUG" |
||||
|
CXXFLAGS="${CFLAGS} -fvisibility-inlines-hidden -Wcast-qual -Wnon-virtual-dtor -std=c++11 -fno-exceptions" |
||||
|
if [ "$has_rtti" != "YES" ]; then CXXFLAGS="$CXXFLAGS -fno-rtti"; fi |
||||
|
LDFLAGS="-L${prefix}/lib" |
||||
|
LIBFILE="${prefix}/lib/libLLVM-$version.so" |
||||
|
LLVM_LIBRARIES="-lLLVMTableGen -lLLVMLibDriver -lLLVMOption -lLLVMSymbolize -lLLVMDebugInfoPDB -lLLVMDebugInfoDWARF -lLLVMTestingSupport -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils -lLLVMARMDisassembler -lLLVMARMCodeGen -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMLineEditor -lLLVMMIRParser -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMOrcJIT -lLLVMInterpreter -lLLVMObjectYAML -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMCodeGen -lLLVMX86Desc -lLLVMMCDisassembler -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMMCJIT -lLLVMExecutionEngine -lLLVMTarget -lLLVMRuntimeDyld -lgtest_main -lgtest -lLLVMCoroutines -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMScalarOpts -lLLVMLinker -lLLVMIRReader -lLLVMAsmParser -lLLVMDlltoolDriver -lLLVMInstCombine -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMCoverage -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle" |
||||
|
|
||||
|
show_components () { |
||||
|
if [ "$arch" == "x86_64" -o "$arch" == "i686" ]; then arch="x86"; fi |
||||
|
components="all all-targets analysis $arch ${arch}asmparser ${arch}asmprinter ${arch}codegen ${arch}desc" |
||||
|
components="$components ${arch}disassembler ${arch}info asmparser asmprinter bitreader bitwriter codegen" |
||||
|
components="$components core coroutines coverage debuginfocodeview debuginfodwarf debuginfomsf debuginfopdb" |
||||
|
components="$components demangle engine executionengine globalisel instcombine instrumentation interpreter" |
||||
|
components="$components ipo irreader libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser" |
||||
|
components="$components mirparser native nativecodegen objcarcopts object objectyaml option orcjit passes" |
||||
|
components="$components profiledata runtimedyld scalaropts selectiondag support symbolize tablegen target" |
||||
|
components="$components transformutils vectorize" |
||||
|
if [ "$arch" != "arm" ]; then components="$components ${arch}utils"; fi |
||||
|
echo "$components" |
||||
|
} |
||||
|
|
||||
|
handle_args () { |
||||
|
case "${1##--}" in |
||||
|
version) echo "$version";; |
||||
|
prefix) echo "$prefix";; |
||||
|
src-root) echo "@TERMUX_PKG_SRCDIR@";; |
||||
|
obj-root) echo "$prefix";; |
||||
|
bindir) echo "$prefix/bin";; |
||||
|
includedir) echo "@TERMUX_PKG_SRCDIR@/llvm/include";; |
||||
|
libdir) echo "$prefix/lib";; |
||||
|
cppflags) echo "$CPPFLAGS";; |
||||
|
cflags) echo "$CFLAGS";; |
||||
|
cxxflags) echo "$CXXFLAGS";; |
||||
|
ldflags) echo "$LDFLAGS";; |
||||
|
system-libs) echo "-lc -ldl -lncurses -lz -lm";; |
||||
|
libs) echo "$LLVM_LIBRARIES";; |
||||
|
libnames) echo "libLLVM-$version.so";; |
||||
|
libfiles) echo "$LIBFILE";; |
||||
|
components) show_components;; |
||||
|
targets-built) echo "@LLVM_TARGETS@";; |
||||
|
host-target) echo "@LLVM_DEFAULT_TARGET_TRIPLE@";; |
||||
|
build-mode) echo "Release";; |
||||
|
assertion-mode) echo "OFF";; |
||||
|
build-system) echo "cmake";; |
||||
|
has-rtti) echo "$has_rtti";; |
||||
|
has-global-isel) echo "OFF";; |
||||
|
shared-mode) echo "shared";; |
||||
|
cmakedir) echo "$prefix/lib/cmake/llvm";; |
||||
|
# don't know what these do |
||||
|
link-shared) ;; |
||||
|
link-static) ;; |
||||
|
*) show_help >&2;; |
||||
|
esac |
||||
|
} |
||||
|
|
||||
|
for arg in $@; do handle_args $arg; done |
||||
|
|
||||
@ -1,19 +0,0 @@ |
|||||
diff --git a/rdmd/rdmd.d b/rdmd/rdmd.d
|
|
||||
index 06f46d7..af22c35 100755
|
|
||||
--- a/rdmd/rdmd.d
|
|
||||
+++ b/rdmd/rdmd.d
|
|
||||
@@ -386,7 +386,13 @@ bool inALibrary(string source, string object)
|
|
||||
|
|
||||
private @property string myOwnTmpDir() |
|
||||
{ |
|
||||
- auto tmpRoot = userTempDir ? userTempDir : tempDir();
|
|
||||
+ import std.file : empty, exists;
|
|
||||
+ import std.process : environment;
|
|
||||
+
|
|
||||
+ string shellTemp = environment.get("TMPDIR");
|
|
||||
+ string defaultTemp = !shellTemp.empty && shellTemp.exists ? shellTemp
|
|
||||
+ : tempDir();
|
|
||||
+ auto tmpRoot = userTempDir ? userTempDir : defaultTemp;
|
|
||||
version (Posix) |
|
||||
{ |
|
||||
import core.sys.posix.unistd; |
|
||||
Loading…
Reference in new issue