Changeset 18

Timestamp:

Nov 17, 2005, 5:28:04 PM (20 years ago)

Author:

dmik

Message:

Setup GCC before everything else, to prevent it from possible reordering of some essential paths

File:

• trunk/configure.cmd (modified) (3 diffs)

trunk/configure.cmd

@@ -355 +355 @@
     call lineout G.!QtCmd, '    call RxFuncAdd ''SysBootDrive'', ''RexxUtil'', ''SysBootDrive'''
     call lineout G.!QtCmd, ''
+    /* 
+     *  setup GCC before everything else, to prevent it from possible reordering
+     *  of some essential paths
+     */
+    call lineout G.!QtCmd, '/* setup the GCC environment */'
+    call lineout G.!QtCmd, '''call'' GCC_PATH''\bin\gccenv.cmd'' GCC_PATH ''VAC308'''
+    call lineout G.!QtCmd, ''
     call lineout G.!QtCmd, 'call value ''QMAKESPEC'', QMAKESPEC, ''OS2ENVIRONMENT'''
     call lineout G.!QtCmd, 'call value ''QTDIR'', QTDIR, ''OS2ENVIRONMENT'''
@@ -361 +368 @@
     call lineout G.!QtCmd, 'call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin'''
     call lineout G.!QtCmd, ''
+    /*
+     *  the order of variables below is important! GCCPath must come first
+     *  in order to appear last in PATH (to ensure that, on the contrary, paths
+     *  to the linker and to the make tool choosen by the user are always at
+     *  the beginning) 
+     */
     call ConfigureCompiler_GenAddPathEnv 'PATH',,
         Opt.!GCCPath.!addPath';'Opt.!ILINKPath.!addPath';'Opt.!GNUMAKEPath.!addPath
@@ -372 +385 @@
     call lineout G.!QtCmd, 'call AddPathEnv ''LIBRARY_PATH'', SysBootDrive()''\OS2\DLL'''
     call lineout G.!QtCmd, 'call AddPathEnv ''LIBRARY_PATH'', SysBootDrive()''\MPTN\DLL'''
-    call lineout G.!QtCmd, ''
-    call lineout G.!QtCmd, '/* setup the GCC environment */'
-    call lineout G.!QtCmd, '''call'' GCC_PATH''\bin\gccenv.cmd'' GCC_PATH ''VAC308'''
     call lineout G.!QtCmd, ''
     call lineout G.!QtCmd, 'parse arg args'