summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-26 11:55:17 -0400
committermidipix <writeonce@midipix.org>2016-04-26 11:57:50 -0400
commit959a9435744ad0515086156349fa424c2b5ef7d8 (patch)
tree99e824a1dead0f0976cdca0aed802758a16019f1
parentbbe9425f42c4a9ce37eeba58f2142ed58285f328 (diff)
downloadsofort-959a9435744ad0515086156349fa424c2b5ef7d8.tar.bz2
sofort-959a9435744ad0515086156349fa424c2b5ef7d8.tar.xz
build system: move implib and soname defs to pe- and elf-specific recipes.
-rw-r--r--project/custom.mk4
-rw-r--r--project/defs.mk4
-rw-r--r--sysinfo/os/elf.mk2
-rw-r--r--sysinfo/os/pe.mk4
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