diff --git a/libclc/amdgcn-mesa3d b/libclc/amdgcn-mesa3d
new file mode 120000
index 000000000000..400782833efe
--- /dev/null
+++ b/libclc/amdgcn-mesa3d
@@ -0,0 +1 @@
+amdgcn-amdhsa
\ No newline at end of file
diff --git a/libclc/configure.py b/libclc/configure.py
index 55ef1bbb1d0d..8c021b93fd48 100755
--- a/libclc/configure.py
+++ b/libclc/configure.py
@@ -187,8 +187,6 @@ for target in targets:
   for arch in archs:
     subdirs.append("%s-%s-%s" % (arch, t_vendor, t_os))
     subdirs.append("%s-%s" % (arch, t_os))
-    if t_os == 'mesa3d':
-        subdirs.append('amdgcn-amdhsa')
     subdirs.append(arch)
     if arch == 'amdgcn' or arch == 'r600':
         subdirs.append('amdgpu')