mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 10:12:58 +00:00
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in
|
|
index 8f481df..681ac59 100644
|
|
--- a/gcc/vhdl/Make-lang.in
|
|
+++ b/gcc/vhdl/Make-lang.in
|
|
@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../
|
|
AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \
|
|
-I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \
|
|
-I$(AGCC_GCCSRC_DIR)/libcpp/include
|
|
-AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS)
|
|
+AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS)
|
|
|
|
AGCC_LOCAL_OBJS=ortho-lang.o
|
|
|
|
@@ -140,7 +140,7 @@ ghdl$(exeext): force
|
|
|
|
# Ghdl libraries.
|
|
ghdllib: ghdl$(exeext) $(GCC_PASSES) force
|
|
- $(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib
|
|
+ $(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib
|
|
|
|
# Build hooks:
|
|
|
|
diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in
|
|
index d754c6c..07abc4a 100644
|
|
--- a/gcc/vhdl/Makefile.in
|
|
+++ b/gcc/vhdl/Makefile.in
|
|
@@ -80,7 +80,8 @@ T_CPPFLAGS =
|
|
X_ADAFLAGS =
|
|
T_ADAFLAGS =
|
|
|
|
-ADAC = $(CC)
|
|
+# Never use the bootstrapped compiler, as it may not be built for ada
|
|
+ADAC = gcc
|
|
|
|
ECHO = echo
|
|
CHMOD = chmod
|