1 files changed, 7 insertions, 9 deletions
diff --git a/perl.c b/perl.c
index 32d47ddabe..fa8856617f 100644
--- a/perl.c
+++ b/perl.c
@@ -1395,7 +1395,10 @@ S_set_caret_X(pTHX) {
     GV* tmpgv = gv_fetchpvs("\030", GV_ADD|GV_NOTQUAL, SVt_PV); /* $^X */
     if (tmpgv) {
 	SV *const caret_x = GvSV(tmpgv);
-#ifdef HAS_PROCSELFEXE
+#if defined(OS2)
+	sv_setpv(caret_x, os2_execname(aTHX));
+#else
+#  ifdef HAS_PROCSELFEXE
 	char buf[MAXPATHLEN];
 	int len = readlink(PROCSELFEXE_PATH, buf, sizeof(buf) - 1);
 
@@ -1417,17 +1420,12 @@ S_set_caret_X(pTHX) {
 	*/
 	if (len > 0 && memchr(buf, '/', len)) {
 	    sv_setpvn(caret_x, buf, len);
+	    return;
 	}
-	else {
-	    sv_setpv(caret_x, PL_origargv[0]);
-	}
-#else
-#ifdef OS2
-	sv_setpv(caret_x, os2_execname(aTHX));
-#else
+#  endif
+	/* Fallback to this:  */
 	sv_setpv(caret_x, PL_origargv[0]);
 #endif
-#endif
     }
 }