diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2020-05-07 06:11:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 06:11:13 -0400 |
| commit | 26db5dff18a40b402d20a572953870aab549c5f2 (patch) | |
| tree | 539d6a9800f41efad4ed50b1864aae1e677ccded /lib/internal_cmd.c | |
| parent | 6cc450d8ff714af09374f9bc07aea8bb05f74a5c (diff) | |
| parent | de47b0d91a79651088e76d64dc4b032146203cca (diff) | |
| download | spmc-26db5dff18a40b402d20a572953870aab549c5f2.tar.gz | |
Merge pull request #33 from jhunkeler/install-name-tool
Install name tool (etc...)
Diffstat (limited to 'lib/internal_cmd.c')
| -rw-r--r-- | lib/internal_cmd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/internal_cmd.c b/lib/internal_cmd.c index 6f6b1c6..a859b5b 100644 --- a/lib/internal_cmd.c +++ b/lib/internal_cmd.c @@ -218,7 +218,11 @@ int mkruntime_interface(int argc, char **argv) { runtime_set(rt, "SPM_MAN", fs->mandir); runtime_set(rt, "SPM_LOCALSTATE", fs->localstatedir); runtime_set(rt, "SPM_PKGCONFIG", spm_pkgconfigdir); +#if OS_DARWIN + runtime_set(rt, "SPM_PKGCONFIG", "${SPM_PKGCONFIG}:${SPM_DATA}/pkgconfig"); +#elif OS_LINUX runtime_set(rt, "SPM_PKGCONFIG", "${SPM_PKGCONFIG}:${SPM_LIB64}/pkgconfig:${SPM_DATA}/pkgconfig"); +#endif runtime_set(rt, "SPM_META_DEPENDS", SPM_META_DEPENDS); runtime_set(rt, "SPM_META_PREFIX_BIN", SPM_META_PREFIX_BIN); runtime_set(rt, "SPM_META_PREFIX_TEXT", SPM_META_PREFIX_TEXT); @@ -236,9 +240,10 @@ int mkruntime_interface(int argc, char **argv) { runtime_set(rt, "CC", "$SPM_BIN/gcc"); } - runtime_set(rt, "CFLAGS", "-I$SPM_INCLUDE $CFLAGS"); + runtime_set(rt, "CFLAGS", "-I$SPM_INCLUDE"); #if OS_DARWIN - runtime_set(rt, "LDFLAGS", "-rpath $SPM_LIB:$SPM_LIB64 -L$SPM_LIB -L$SPM_LIB64 $LDFLAGS"); + // For now `reloc` can fix up the LC_ID_DYLIB on its own without install_name_tool + runtime_set(rt, "LDFLAGS", "-rpath $SPM_LIB -L$SPM_LIB"); #elif OS_LINUX runtime_set(rt, "LDFLAGS", "-Wl,-rpath=$SPM_LIB:$SPM_LIB64 -L$SPM_LIB -L$SPM_LIB64 $LDFLAGS"); #else |