diff options
| author | midipix <writeonce@midipix.org> | 2016-04-26 11:55:17 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-11-10 23:35:42 -0500 |
| commit | 9f9f2d66aaad5f5f43dcb20f6aa09eeab3f26925 (patch) | |
| tree | 32402b84025214e3d7242952fb1950221adbbbbf | |
| parent | 19bc34e8b66817d412539e24694b3664fa24126a (diff) | |
| download | perk-9f9f2d66aaad5f5f43dcb20f6aa09eeab3f26925.tar.bz2 perk-9f9f2d66aaad5f5f43dcb20f6aa09eeab3f26925.tar.xz | |
build system: move implib and soname defs to pe- and elf-specific recipes.
| -rw-r--r-- | project/custom.mk | 4 | ||||
| -rw-r--r-- | project/defs.mk | 4 | ||||
| -rw-r--r-- | sysinfo/os/elf.mk | 2 | ||||
| -rw-r--r-- | sysinfo/os/pe.mk | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/project/custom.mk b/project/custom.mk index 3a30273..16ff41d 100644 --- a/project/custom.mk +++ b/project/custom.mk @@ -1,3 +1,7 @@ ifeq ($(OS_BINFMT),PE) include $(PROJECT_DIR)/sysinfo/os/pe.mk endif + +ifeq ($(OS_BINFMT),ELF) +include $(PROJECT_DIR)/sysinfo/os/elf.mk +endif diff --git a/project/defs.mk b/project/defs.mk index e80bd59..c1d6693 100644 --- a/project/defs.mk +++ b/project/defs.mk @@ -52,10 +52,6 @@ LDFLAGS_SHARED = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(SHARED_LIB_DEPS) $(LDFLAGS_LAST) -LDFLAGS_SHARED += -Wl,-soname -LDFLAGS_SHARED += -Wl,$(DSO_SONAME) -LDFLAGS_SHARED += $(LDFLAGS_IMPLIB) - LDFLAGS_APP = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(SHARED_APP_DEPS) $(LDFLAGS_LAST) diff --git a/sysinfo/os/elf.mk b/sysinfo/os/elf.mk new file mode 100644 index 0000000..5a3940f --- /dev/null +++ b/sysinfo/os/elf.mk @@ -0,0 +1,2 @@ +LDFLAGS_SHARED += -Wl,-soname +LDFLAGS_SHARED += -Wl,$(DSO_SONAME) diff --git a/sysinfo/os/pe.mk b/sysinfo/os/pe.mk index 0b50df2..58144aa 100644 --- a/sysinfo/os/pe.mk +++ b/sysinfo/os/pe.mk @@ -1,5 +1,9 @@ LDFLAGS_IMPLIB += -Wl,--output-def LDFLAGS_IMPLIB += -Wl,$(IMPLIB_DEF) +LDFLAGS_SHARED += $(LDFLAGS_IMPLIB) + +LDFLAGS_SHARED += -Wl,-soname +LDFLAGS_SHARED += -Wl,$(DSO_SONAME) implib: implib-ver implib-soname implib-solink |