From 4e2b3cdbec88d2a5777fd5482fc8461bd3e540b0 Mon Sep 17 00:00:00 2001
From: slmnemo <nicholas.lucioforlife@yahoo.com>
Date: Sun, 3 Nov 2024 21:33:29 -0800
Subject: [PATCH] Removed symlinks for non-buildroot derivative configs

---
 bin/derivgen.pl | 18 ++++++++++--------
 bin/wsim        |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/derivgen.pl b/bin/derivgen.pl
index 5dee10243..8a065bf7e 100755
--- a/bin/derivgen.pl
+++ b/bin/derivgen.pl
@@ -88,14 +88,16 @@ foreach my $key (@derivnames) {
     open(my $unmod, $configunmod) or die "Could not open file '$configunmod' $!";
     open(my $fh, '>>', $config) or die "Could not open file '$config' $!";
 
-    # Create symlink to imperas.ic for deriv if exists
-    my $baseimperas_ic = "$ENV{WALLY}/config/$basederiv{$key}/imperas.ic";
-    if (! -e $baseimperas_ic) {
-        my $baseimperas_ic = "$ENV{WALLY}/config/deriv/$basederiv{$key}/config.vh";
-    }
-    if (-e $baseimperas_ic) { # If imperas.ic exists for base derivative, create hardlink to it
-        my $imperas_ic = "$dir/imperas.ic";
-        system("ln -T $baseimperas_ic $imperas_ic");
+    # Create symlink to imperas.ic for deriv buildroot
+    if ($key eq "buildroot") {
+        my $baseimperas_ic = "$ENV{WALLY}/config/$basederiv{$key}/imperas.ic";
+        if (! -e $baseimperas_ic) {
+            my $baseimperas_ic = "$ENV{WALLY}/config/deriv/$basederiv{$key}/config.vh";
+        }
+        if (-e $baseimperas_ic) { # If imperas.ic exists for base derivative, create hardlink to it
+            my $imperas_ic = "$dir/imperas.ic";
+            system("ln -T $baseimperas_ic $imperas_ic");
+        }
     }
 
     my $datestring = localtime();
diff --git a/bin/wsim b/bin/wsim
index dde022bed..d930277ec 100755
--- a/bin/wsim
+++ b/bin/wsim
@@ -90,7 +90,7 @@ else: EnableLog = 0
 prefix = ""
 if (args.lockstep or args.lockstepverbose or args.fcov or args.fcovimp):
     if (args.sim == "questa" or args.sim == "vcs"):
-        prefix = "IMPERAS_TOOLS=" + WALLY + "/config/"+args.config+"/imperas.ic"
+        prefix = "IMPERAS_TOOLS=" + os.path.join(WALLY, "config", args.config, "imperas.ic")
         if not os.path.isfile(prefix): # If config is a derivative, look for imperas.ic in derivative configs
             prefix = "IMPERAS_TOOLS=" + os.path.join(WALLY, "config", "deriv", args.config, "imperas.ic")
 # Force Questa to use 64-bit mode, sometimes it defaults to 32-bit even on 64-bit machines