mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +00:00
b2fed75484
svn path=/nixpkgs/branches/stdenv-updates/; revision=19709
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
diff --git a/libada/Makefile.in b/libada/Makefile.in
|
|
index f5057a0..337e0c6 100644
|
|
--- a/libada/Makefile.in
|
|
+++ b/libada/Makefile.in
|
|
@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
|
|
WARN_CFLAGS = @warn_cflags@
|
|
|
|
TARGET_LIBGCC2_CFLAGS=
|
|
-GNATLIBCFLAGS= -g -O2
|
|
+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
|
|
GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
|
|
-DIN_RTS @have_getipinfo@
|
|
|
|
--- a/gcc/ada/gcc-interface/Makefile.in
|
|
+++ b/gcc/ada/gcc-interface/Makefile.in
|
|
@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
|
|
SOME_ADAFLAGS =-gnata
|
|
FORCE_DEBUG_ADAFLAGS = -g
|
|
GNATLIBFLAGS = -gnatpg -nostdinc
|
|
-GNATLIBCFLAGS = -g -O2
|
|
+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
|
|
# Pretend that _Unwind_GetIPInfo is available for the target by default. This
|
|
# should be autodetected during the configuration of libada and passed down to
|
|
# here, but we need something for --disable-libada and hope for the best.
|
|
@@ -1838,7 +1838,7 @@ ADA_INCLUDE_SRCS =\
|
|
|
|
LIBGNAT=../$(RTSDIR)/libgnat.a
|
|
|
|
-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
|
|
+GCC_LINK=$(CC) -static-libgcc $(CFLAGS_FOR_TARGET) $(ADA_INCLUDES)
|
|
|
|
# when compiling the tools, the runtime has to be first on the path so that
|
|
# it hides the runtime files lying with the rest of the sources
|