Commit 437b357f authored by Andreas Bombe's avatar Andreas Bombe

Let Makefile.in respect LDFLAGS from environment

Adjust adjust-compile-flags patch to make Makefile.in respect LDFLAGS
from the environment. Previously it used CFLAGS and so on when it is
present with a value and its own defaults otherwise. There are no
defaults for LDFLAGS but it was set to the empty value only,
overwriting the value from the environment.

Likewise, use LDFLAGS in the initialisation of SHLIB_FLAGS. The values
SHLIB_FLAGS are set to are now appended to LDFLAGS instead.
parent db28765f
Description: Apply compile flags as required by Debian
Author: Andreas Bombe <aeb@debian.org>
Last-Update: 2018-01-12
Last-Update: 2018-08-04
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in 2018-05-13 03:59:31.407271758 +0200
+++ git/Makefile.in 2018-05-13 03:59:31.403271763 +0200
@@ -406,10 +406,10 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,13 +99,14 @@
#target=x86_64-apple-darwin
#target=i386-pc-mingw32
+SHLIB_FLAGS=$(LDFLAGS)
ifeq ($(SOEXT),.so)
-SHLIB_FLAGS=-Wl,-soname,$@
+SHLIB_FLAGS+=-Wl,-soname,$@
else ifeq ($(SOEXT),.dll)
-SHLIB_FLAGS=
+SHLIB_FLAGS+=
else ifeq ($(SOEXT),.dylib)
# Allow the use of -rpath in executable
-SHLIB_FLAGS=-Wl,-install_name,@rpath/$@
+SHLIB_FLAGS+=-Wl,-install_name,@rpath/$@
endif
# Flags for libraries
@@ -406,10 +407,10 @@
vpi_thunk.o: $(GRTSRCDIR)/vpi_thunk.c $(GRTSRCDIR)/vpi_thunk.h
# Do not use OPT_FLAGS (do not enable coverage)
......@@ -20,3 +36,14 @@ Index: git/Makefile.in
all.vpi: libghdlvpi$(SOEXT)
--- a/configure
+++ b/configure
@@ -16,7 +16,7 @@
CFLAGS=${CFLAGS:--g}
GNATMAKE=${GNATMAKE:-gnatmake}
MAKE=${MAKE:-make}
-LDFLAGS=
+LDFLAGS=${LDFLAGS}
prefix=/usr/local
libdirsuffix=lib/ghdl
incdirsuffix=include
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment