aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libraries/Makefile.inc4
-rw-r--r--src/ghdldrv/ghdldrv.adb3
2 files changed, 3 insertions, 4 deletions
diff --git a/libraries/Makefile.inc b/libraries/Makefile.inc
index f4af50078..a14f8416b 100644
--- a/libraries/Makefile.inc
+++ b/libraries/Makefile.inc
@@ -353,6 +353,6 @@ $(STD93_DIR)/std_standard.o: $(GHDL) std.v93
$(STD08_DIR)/std_standard.o: $(GHDL) std.v08
cd $(STD08_DIR); $(ANALYZE_STD) --std=08
-libs.vhdl.standard: $(STD93_DIR)/std_standard.o \
- $(STD87_DIR)/std_standard.o \
+libs.vhdl.standard: $(STD87_DIR)/std_standard.o \
+ $(STD93_DIR)/std_standard.o \
$(STD08_DIR)/std_standard.o
diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index 31d4a530b..f629c9ad1 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -832,8 +832,7 @@ package body Ghdldrv is
raise Option_Error;
end if;
- Set_Tools_Name;
- Locate_Tools;
+ Setup_Compiler (False);
Opt (1) := new String'("--compile-standard");
Do_Compile (Opt, "std_standard.vhdl", True);