Changeset 3193 for trunk

Timestamp:

Apr 22, 2007, 2:10:20 PM (18 years ago)

Author:

bird

Message:

we're *not* emx and don't want anything to do with any stray emx installations on the system.

File:

• trunk/essentials/dev-lang/perl/hints/os2.sh (modified) (13 diffs)

trunk/essentials/dev-lang/perl/hints/os2.sh

@@ -11 +11 @@
 # Note that symbol extraction code gives wrong answers (sometimes?) on
 # gethostent and setsid.
+set -x
 
 # Optimization (GNU make 3.74 cannot be loaded :-():
@@ -37 +38 @@
  set $MANPATH
  tryman="$@"
- set $LIBRARY_PATH
+ set `gcc -print-search-dirs | grep libraries | sed -e "s/^libraries: *=//" `
  libemx="$@"
  set $C_INCLUDE_PATH
@@ -46 +47 @@
  
  # indented to avoid having it *two* times at start
- libemx="`./UU/loc os2.a /emx/lib $libemx`"
-
-usrinc="`./UU/loc stdlib.h /emx/include $usrinc`"
+ libemx="`./UU/loc libc_alias.a $libemx`"
+
+usrinc="`./UU/loc stdlib.h  $usrinc`"
 usrinc="`dirname $usrinc | tr '\\\' '/'`"
 libemx="`dirname $libemx | tr '\\\' '/'`"
@@ -55 +56 @@
   sysman="$tryman/man1"
 else
-  sysman="`./UU/loc . /man/man1 c:/man/man1 c:/usr/man/man1 d:/man/man1 d:/usr/man/man1 e:/man/man1 e:/usr/man/man1 f:/man/man1 f:/usr/man/man1 g:/man/man1 g:/usr/man/man1 /usr/man/man1`"
-fi
-
-emxpath="`dirname $libemx`"
+  sysman="`./UU/loc . /man/man1 $UNIXROOT/usr/share/man/man1 $UNIXROOT/usr/man/man1 c:/man/man1 c:/usr/man/man1 d:/man/man1 d:/usr/man/man1 e:/man/man1 e:/usr/man/man1 f:/man/man1 f:/usr/man/man1 g:/man/man1 g:/usr/man/man1 /usr/man/man1`"
+fi
+
+#emxpath="`dirname $libemx`"
+#if test ! -d "$emxpath"; then 
+#  emxpath="`./UU/loc . /emx c:/emx d:/emx e:/emx f:/emx g:/emx h:/emx /emx`"
+#fi
+emxpath="`which gcc.exe`"
+emxpath="`dirname $emxpath`"
+emxpath="`dirname $emxpath`"
 if test ! -d "$emxpath"; then 
-  emxpath="`./UU/loc . /emx c:/emx d:/emx e:/emx f:/emx g:/emx h:/emx /emx`"
+  emxpath="$UNIXROOT/usr"
 fi
 
@@ -70 +77 @@
     libemx="$LIBRARY_PATH"
   else
-    libemx="`./UU/loc . X c:/emx/lib d:/emx/lib e:/emx/lib f:/emx/lib g:/emx/lib h:/emx/lib /emx/lib`"
+    libemx="`./UU/loc . X $UNIXROOT/usr/lib $UNIXROOT/lib $UNIXROOT/usr/local/lib`"
   fi
 fi
@@ -81 +88 @@
       usrinc="$C_INCLUDE_PATH"
     else
-      usrinc="`./UU/loc . X c:/emx/include d:/emx/include e:/emx/include f:/emx/include g:/emx/include h:/emx/include /emx/include`"
+      usrinc="`./UU/loc . X $UNIXROOT/usr/include $UNIXROOT/usr/local/include`"
     fi
   fi
 fi
 
-rsx="`./UU/loc rsx.exe undef $pth`"
+#rsx="`./UU/loc rsx.exe undef $pth`"
 
 if test "$libemx" = "X"; then echo "Cannot find C library!" >&2; fi
@@ -92 +99 @@
 # Acute backslashitis:
 libpth="`echo \"$LIBRARY_PATH\" | tr ';\\\' ' /'`"
-libpth="$libpth $libemx/mt $libemx"
-
-set `cmd /c emxrev -f emxlibcm`
-emxcrtrev=$5
+libpth="$libpth $libemx"
+
+#set `cmd /c emxrev -f emxlibcm`
+#emxcrtrev=$5
 # indented to not put it into config.sh
-  _defemxcrtrev=-D_EMX_CRT_REV_=$emxcrtrev
+  #_defemxcrtrev=-D_EMX_CRT_REV_=$emxcrtrev
+  _defemxcrtrev=-D_EMX_CRT_REV_=61
 
 so='dll'
@@ -133 +141 @@
 aout_lddlflags="-Zdll $ld_dll_optimize"
 
-# -D__ST_MT_ERRNO__ allows a quick relink with -Zmtd to check problems
-# which may be due to linking with -Zmtd DLLs
-
 # Cannot have 32000K stack: get SYS0170  ?!
-if [ $emxcrtrev -ge 50 ]; then 
-    aout_ldflags='-Zexe -Zsmall-conv -Zstack 16000 -D__ST_MT_ERRNO__'
-else
-    aout_ldflags='-Zexe -Zstack 16000 -D__ST_MT_ERRNO__'
-fi
+aout_ldflags='-Zexe -Zstack 16000 '
 
 # To get into config.sh:
@@ -149 +150 @@
 aout_ccflags="-DDOSISH -DOS2=2 -DEMBED -I. $_defemxcrtrev "
 aout_cppflags="-DDOSISH -DOS2=2 -DEMBED -I. $_defemxcrtrev "
-aout_use_clib='c'
+aout_use_clib='libc_dll'
 aout_usedl='undef'
 aout_archobjs="os2.o dl_os2.o"
@@ -165 +166 @@
     ar="$aout_ar"
     plibext="$aout_plibext"
-    if [ $emxcrtrev -lt 50 ]; then 
-        d_fork="$aout_d_fork"
-    fi
+    d_fork='define'
     lddlflags="$aout_lddlflags"
     ldflags="$aout_ldflags"
@@ -181 +180 @@
     ar='emxomfar'
     plibext='.lib'
-    if [ $emxcrtrev -ge 50 ]; then 
-        d_fork='define'
-    else
-        d_fork='undef'
-    fi
+    d_fork='define'
     lddlflags="-Zdll -Zomf "
     # Recursive regmatch may eat 2.5M of stack alone.
     ldflags='-Zexe -Zomf -Zstack 32000 '
-    if [ $emxcrtrev -ge 50 ]; then 
-        ccflags="-Zomf -Zmt -DDOSISH -DOS2=2 -DEMBED -I. $_defemxcrtrev"
-    else
-        ccflags="-Zomf -Zmt -DDOSISH -DOS2=2 -DEMBED -I. -DEMX_BAD_SBRK $_defemxcrtrev"
-    fi
-    use_clib='c_import'
+    ccflags="-Zomf -DDOSISH -DOS2=2 -DEMBED -I. $_defemxcrtrev"
+    use_clib='libc_dll'
     usedl='define'
 fi
@@ -207 +198 @@
 libperl="libperl${plibext}"
 
-#libc="/emx/lib/st/c_import$lib_ext"
-libc="$libemx/mt/$use_clib$lib_ext"
-
-if test -r "$libemx/c_alias$lib_ext"; then 
-    libnames="$libemx/c_alias$lib_ext"
+
+libc="$libemx/$use_clib$lib_ext"
+
+if test -r "$libemx/libc_alias$lib_ext"; then 
+    libnames="$libemx/libc_alias$lib_ext"
 fi
 # otherwise puts -lc ???
@@ -431 +422 @@
 case "$usethreads" in
 $define|true|[yY]*)
-        ccflags="-Zmt $ccflags"
-        cppflags="-Zmt $cppflags"  # Do we really need to set this?
+        ccflags="$ccflags"
+        cppflags="$cppflags"  # Do we really need to set this?
         aout_ccflags="-DUSE_THREADS $aout_ccflags"
         aout_cppflags="-DUSE_THREADS $aout_cppflags"
-        aout_lddlflags="-Zmt $aout_lddlflags"
-        aout_ldflags="-Zmt $aout_ldflags"
+        aout_lddlflags="$aout_lddlflags"
+        aout_ldflags="$aout_ldflags"
         ;;
 esac