diff options
Diffstat (limited to 'expose-cargs-and-largs-makefile.patch')
| -rw-r--r-- | expose-cargs-and-largs-makefile.patch | 69 |
1 files changed, 56 insertions, 13 deletions
diff --git a/expose-cargs-and-largs-makefile.patch b/expose-cargs-and-largs-makefile.patch index 113a29a9bd7b..5021c9d78aec 100644 --- a/expose-cargs-and-largs-makefile.patch +++ b/expose-cargs-and-largs-makefile.patch @@ -1,28 +1,71 @@ -diff --git a/Makefile b/Makefile -index b591cb9a..4d711028 100644 --- a/Makefile +++ b/Makefile -@@ -67,6 +67,14 @@ else +@@ -70,6 +70,14 @@ LIBGPR_TYPES=static endif +ifneq ($(strip $(CFLAGS)),) -+ CARGS := -cargs $(CFLAGS) ++ TOOLFLAGS += -cargs $(CFLAGS) +endif + +ifneq ($(strip $(LDFLAGS)),) -+ LARGS := -largs $(LDFLAGS) ++ TOOLFLAGS += -largs $(LDFLAGS) +endif + # Used to pass extra options to GPRBUILD, like -d for instance GPRBUILD_OPTIONS= -@@ -75,7 +83,7 @@ LIB_INSTALLER=gprinstall -p -f --target=$(TARGET) $(RBD) --prefix=${prefix} - CLEANER=gprclean -q $(RBD) +@@ -92,27 +100,27 @@ + .PHONY: all distall gprbuild gprconfig gprclean gprinstall gprname gprls + + build all: +- $(GPRBUILD_BUILDER) ++ $(GPRBUILD_BUILDER) $(TOOLFLAGS) + + distall: all install + + gprbuild: +- $(GPRBUILD_BUILDER) gprbuild-main.adb ++ $(GPRBUILD_BUILDER) gprbuild-main.adb $(TOOLFLAGS) + + gprinstall: +- $(GPRBUILD_BUILDER) gprinstall-main.adb ++ $(GPRBUILD_BUILDER) gprinstall-main.adb $(TOOLFLAGS) + + gprclean: +- $(GPRBUILD_BUILDER) gprclean-main.adb ++ $(GPRBUILD_BUILDER) gprclean-main.adb $(TOOLFLAGS) + + gprconfig: +- $(GPRBUILD_BUILDER) gprconfig-main.adb ++ $(GPRBUILD_BUILDER) gprconfig-main.adb $(TOOLFLAGS) + + gprname: +- $(GPRBUILD_BUILDER) gprname-main.adb ++ $(GPRBUILD_BUILDER) gprname-main.adb $(TOOLFLAGS) + + gprls: +- $(GPRBUILD_BUILDER) gprls-main.adb ++ $(GPRBUILD_BUILDER) gprls-main.adb $(TOOLFLAGS) + + ################################# + # Gprbuild installation targets # +@@ -140,15 +148,15 @@ + + libgpr.build.shared: + ${BUILDER} -XLIBRARY_TYPE=relocatable \ +- -XXMLADA_BUILD=relocatable $(GPR_GPR) ++ -XXMLADA_BUILD=relocatable $(GPR_GPR) $(TOOLFLAGS) + + libgpr.build.static: + ${BUILDER} -XLIBRARY_TYPE=static \ +- -XXMLADA_BUILD=static $(GPR_GPR) ++ -XXMLADA_BUILD=static $(GPR_GPR) $(TOOLFLAGS) + + libgpr.build.static-pic: + ${BUILDER} -XLIBRARY_TYPE=static-pic \ +- -XXMLADA_BUILD=static-pic $(GPR_GPR) ++ -XXMLADA_BUILD=static-pic $(GPR_GPR) $(TOOLFLAGS) + + libgpr.install: libgpr.uninstall $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) - GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \ -- -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -+ -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable $(CARGS) $(LARGS) - LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) - LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) -XBUILD=${BUILD} \ - --install-name=gpr --build-var=LIBRARY_TYPE $(GTARGET) |