diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-10-24 14:06:50 +0100 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-10-24 23:13:49 +0800 |
| commit | 70f60c9c89b4773089c621faf0e5765d9488e9fa (patch) | |
| tree | c465c109aa1e72bf60cc243027701677acc9c3cf /src/egl/drivers | |
| parent | a20c2347a0bb9e0e1591b070ee5d0cac81168114 (diff) | |
Ensure -L$(TOP)/$(LIB_DIR) appears in link line before any -L in $LDFLAGS
Ensure -L$(TOP)/$(LIB_DIR) (the staging dir for build products), appears
in the link line before any -L in $LDFLAGS, so that we link driver we are
building with libEGL we have just built, and not an installed version
[olv: make a similar change to targets/egl]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'src/egl/drivers')
| -rw-r--r-- | src/egl/drivers/Makefile.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/drivers/Makefile.template b/src/egl/drivers/Makefile.template index 08e82c65e9..47709e3c59 100644 --- a/src/egl/drivers/Makefile.template +++ b/src/egl/drivers/Makefile.template @@ -24,8 +24,8 @@ $(EGL_DRIVER_PATH): $(EGL_DRIVER) $(EGL_DRIVER): $(EGL_OBJECTS) Makefile $(TOP)/src/egl/drivers/Makefile.template @$(MKLIB) -o $(EGL_DRIVER) -noprefix \ - -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -L$(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ + -linker '$(CC)' -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \ + $(MKLIB_OPTIONS) \ $(EGL_OBJECTS) $(EGL_LIBS) -l$(EGL_LIB) .c.o: |