summaryrefslogtreecommitdiff
blob: ee43497e49c93dd2430529a277641f49c2a8b1c2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
commit 32e46a1fee1091ae58af51b7739da3f92f63ceba
gpg: Signature made Fri 19 Apr 2019 09:43:03 PM PDT
gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
gpg:                issuer "palmer@dabbelt.com"
gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate]
gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate]
Author: Palmer Dabbelt <palmer@dabbelt.com>
Date:   Fri Apr 19 21:42:37 2019 -0700

    Allow the build system to set LIBDIR
    
    This should allow me to pass Gentoo's strict-multlib tests.
    
    Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>

diff --git a/src/libpconfigure/context.c++ b/src/libpconfigure/context.c++
index 234257f9b94e..77f1bef35241 100644
--- a/src/libpconfigure/context.c++
+++ b/src/libpconfigure/context.c++
@@ -22,12 +22,16 @@
 #include "language_list.h++"
 #include <sstream>
 
+#ifndef PCONFIGURE_LIBDIR
+#define PCONFIGURE_LIBDIR "lib"
+#endif
+
 context::context(void)
     : type(context_type::DEFAULT),
       prefix("/usr/local"),
       gen_dir("obj/proc"),
       bin_dir("bin"),
-      lib_dir("lib"),
+      lib_dir(PCONFIGURE_LIBDIR),
       libexec_dir("libexec"),
       obj_dir("obj"),
       src_dir("src"),