diff options
| author | Craig A. Berry <craigberry@mac.com> | 2011-03-06 16:07:30 -0600 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2011-03-06 20:57:52 -0600 |
| commit | 35182409a84e9ffbc214100d50c327cf95b06d7d (patch) | |
| tree | 2d7e6923c5b40d6aea8d6fce379954e14a49e15b | |
| parent | 4581ada393ba58f2b8f438c7b9c336d6c79ec94c (diff) | |
| download | perl-35182409a84e9ffbc214100d50c327cf95b06d7d.tar.gz | |
Add appropriate archname appendages in configure.com.
Now that we have the relevant questions answered before we set
archname, add the appropriate components to archname at the right
time so they'll become part of the architecture-specific
directory names.
FIXME: We don't (yet) set archname64, so at present we're not
adding it to archname.
| -rw-r--r-- | configure.com | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/configure.com b/configure.com index cdd8bcb4f8..f9cc2fbd6d 100644 --- a/configure.com +++ b/configure.com @@ -2382,6 +2382,43 @@ $ THEN $ echo4 "I'll go with ''archname' anyway..." $ ENDIF $ ENDIF +$! +$ IF usethreads .OR. usethreads .EQS. "define" +$ THEN +$ echo4 "Threads selected." +$ IF F$LOCATE("-thread", archname) .EQ. F$LENGTH(archname) +$ THEN +$ archname = "''archname'-thread" +$ echo4 "...setting architecture name to ''archname'." +$ ELSE +$ echo4 "...and architecture name already has -thread." +$ ENDIF +$ ENDIF +$! +$ IF usemultiplicity .OR. usemultiplicity .EQS. "define" +$ THEN +$ echo4 "Multiplicity selected." +$ IF F$LOCATE("-multi", archname) .EQ. F$LENGTH(archname) +$ THEN +$ archname = "''archname'-multi" +$ echo4 "...setting architecture name to ''archname'." +$ ELSE +$ echo4 "...and architecture name already has -multi." +$ ENDIF +$ ENDIF +$! +$ IF uselongdouble .OR. uselongdouble .EQS. "define" +$ THEN +$ echo4 "Long doubles selected." +$ IF F$LOCATE("-ld", archname) .EQ. F$LENGTH(archname) +$ THEN +$ archname = "''archname'-ld" +$ echo4 "...setting architecture name to ''archname'." +$ ELSE +$ echo4 "...and architecture name already has -ld." +$ ENDIF +$ ENDIF +$! $ bool_dflt = "n" $ vms_prefix = "perl_root" $ vms_prefixup = F$EDIT(vms_prefix,"UPCASE") @@ -3382,15 +3419,11 @@ $ IF use_threads $ THEN $ IF use_5005_threads $ THEN -$ arch = "''arch'-thread" -$ archname = "''archname'-thread" $ d_old_pthread_create_joinable = "undef" $ old_pthread_create_joinable = " " $ use5005threads = "define" $ useithreads = "undef" $ ELSE -$ arch = "''arch'-ithread" -$ archname = "''archname'-ithread" $ d_old_pthread_create_joinable = "undef" $ old_pthread_create_joinable = " " $ use5005threads = "undef" |