diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-10-31 14:35:00 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-10-31 14:35:00 +0000 |
| commit | 90f9b8a7bcd02b154a0c068c0589171b43ffba8d (patch) | |
| tree | ee1958eddffdf1749cf48e849ebeb5f88f572ce1 | |
| parent | 83dd2ae095626d8e461f8a69214ec2b97ff18c2f (diff) | |
| download | llvm-90f9b8a7bcd02b154a0c068c0589171b43ffba8d.tar.gz llvm-90f9b8a7bcd02b154a0c068c0589171b43ffba8d.tar.bz2 llvm-90f9b8a7bcd02b154a0c068c0589171b43ffba8d.tar.xz | |
Rules adjustments in order to build on DragonFly BSD.
Patch by Robin Hahling.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193750 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 4 | ||||
| -rw-r--r-- | lib/Support/Unix/Path.inc | 5 | ||||
| -rw-r--r-- | tools/llvm-shlib/Makefile | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.rules b/Makefile.rules index ed7e0e9047..e53598b027 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -274,7 +274,7 @@ CPP.Defines := ifeq ($(ENABLE_OPTIMIZED),1) BuildMode := Release # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin FreeBSD GNU/kFreeBSD)) + ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) OmitFramePointer := -fomit-frame-pointer endif @@ -1290,7 +1290,7 @@ LD.Flags += -Wl,-exported_symbol,_main endif endif -ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU/kFreeBSD GNU)) +ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux NetBSD FreeBSD GNU/kFreeBSD GNU)) ifneq ($(ARCH), Mips) LD.Flags += -Wl,--version-script=$(LLVM_SRC_ROOT)/autoconf/ExportMap.map endif diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index f6a137e7a0..c9dc871671 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -182,7 +182,7 @@ namespace sys { namespace fs { #if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) || \ - defined(__linux__) || defined(__CYGWIN__) + defined(__linux__) || defined(__CYGWIN__) || defined(__DragonFly__) static int test_dir(char buf[PATH_MAX], char ret[PATH_MAX], const char *dir, const char *bin) @@ -251,7 +251,8 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) { return link_path; } #elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ - defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) + defined(__OpenBSD__) || defined(__minix) || defined(__DragonFly__) || \ + defined(__FreeBSD_kernel__) char exe_path[PATH_MAX]; if (getprogpath(exe_path, argv0) != NULL) diff --git a/tools/llvm-shlib/Makefile b/tools/llvm-shlib/Makefile index 1d9053b3d3..92f3132ff5 100644 --- a/tools/llvm-shlib/Makefile +++ b/tools/llvm-shlib/Makefile @@ -62,13 +62,13 @@ ifeq ($(HOST_OS),Darwin) endif endif -ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig)) +ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig)) # Include everything from the .a's into the shared library. LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ -Wl,--no-whole-archive endif -ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU)) +ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) # Add soname to the library. LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) endif |