[Libreoffice-commits] core.git: 2 commits - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk |    2 ++
 solenv/gbuild/platform/solaris.mk           |    4 ----
 solenv/gbuild/platform/unxgcc.mk            |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 0725f1541bf57e0bd5ddd374631f5a2464373b75
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 12 14:24:20 2014 +0100

    gbuild: move setting of gb_CPUDEFS to CPU-specific file
    
    Change-Id: I91b05bb579b4f74fad7b479453389437d4376b2f

diff --git a/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk b/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk
index 7f31c8a..25b3834 100644
--- a/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk
+++ b/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk
@@ -8,6 +8,8 @@
 #
 #*************************************************************************
 
+gb_CPUDEFS := -D__sparcv8plus
+
 include $(GBUILDDIR)/platform/solaris.mk
 
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 3b44e8c..c2147d4 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -25,10 +25,6 @@ ifneq ($(origin AR),default)
 gb_AR := $(AR)
 endif
 
-ifeq ($(CPUNAME),SPARC)
-gb_CPUDEFS := -D__sparcv8plus
-endif
-
 gb_OSDEFS := \
 	-D$(OS) \
 	-DSYSV \
commit c7231176a64e456b388a7c849f243abf9526a28d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 12 14:21:46 2014 +0100

    gbuild: let's read our elves through a variable for consistency
    
    Change-Id: I264a94dc9cdecf1a21ee37b37b5464e05a8e205a

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 034903a..778590b 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -144,7 +144,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(1) \
 	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../ure-link/lib/$(notdir $(1)) $(ILIBTARGET)))
 	$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
-		readelf -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \
+		$(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \
 		$(NM) --dynamic --extern-only --defined-only --format=posix $(1) \
 			| cut -d' ' -f1-2 \
 			>> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \