diff --git a/Makefile b/Makefile
index 7fb07f07de2aee22368089344cd2482feb541416..379374cc1aa5a32323c7260842c1aa7653be2810 100644
--- a/Makefile
+++ b/Makefile
@@ -513,10 +513,10 @@ endif
 
 ##### libCore #####
 
-ifeq ($(BUILDCLING),yes)
-CORELIBEXTRA    += $(CLINGLIBEXTRA)
-STATICEXTRALIBS += $(CLINGLIBEXTRA)
-endif
+# ifeq ($(BUILDCLING),yes)
+# CORELIBEXTRA    += $(CLINGLIBEXTRA)
+# STATICEXTRALIBS += $(CLINGLIBEXTRA)
+# endif
 
 COREL         = $(BASEL1) $(BASEL2) $(BASEL3) $(CONTL) $(METAL) $(ZIPL) \
                 $(SYSTEML) $(CLIBL) $(METAUTILSL) $(TEXTINPUTL)
@@ -825,11 +825,11 @@ endif
 $(CORELIB): $(CLINGO) $(COREO) $(COREDO) $(CINTLIB) $(PCREDEP) $(CORELIBDEP)
 ifneq ($(ARCH),alphacxx6)
 	@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
-	   "$(SOFLAGS)" libCore.$(SOEXT) $@ "$(CLINGO) $(CLINGLIBEXTRA) $(COREO) $(COREDO)" \
+	   "$(SOFLAGS)" libCore.$(SOEXT) $@ "$(COREDO) $(COREO) $(CLINGO) $(CLINGLIBEXTRA) " \
 	   "$(CORELIBEXTRA) $(PCRELDFLAGS) $(PCRELIB) $(CRYPTLIBS)"
 else
 	@$(MAKELIB) $(PLATFORM) $(LD) "$(CORELDFLAGS)" \
-	   "$(SOFLAGS)" libCore.$(SOEXT) $@ "$(CLINGO) $(CLINGLIBEXTRA) $(COREO) $(COREDO)" \
+	   "$(SOFLAGS)" libCore.$(SOEXT) $@ " $(COREDO) $(COREO) $(CLINGO) $(CLINGLIBEXTRA) " \
 	   "$(CORELIBEXTRA) $(PCRELDFLAGS) $(PCRELIB) $(CRYPTLIBS)"
 endif